Merge branch 'release/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 15:56:57 +0000 (11:56 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 15:56:57 +0000 (11:56 -0400)

Trivial merge