Merge remote-tracking branch 'upstream/develop' into 1610-duplicate-check
authorMichael Vogel <ike@pirati.ca>
Fri, 21 Oct 2016 21:17:58 +0000 (21:17 +0000)
committerMichael Vogel <ike@pirati.ca>
Fri, 21 Oct 2016 21:17:58 +0000 (21:17 +0000)

Trivial merge