Merge branch 'master' into win32-x64-working
authornhmall <mjnh@persona.ca>
Thu, 11 Jun 2015 01:11:15 +0000 (21:11 -0400)
committernhmall <mjnh@persona.ca>
Thu, 11 Jun 2015 01:11:15 +0000 (21:11 -0400)

Trivial merge