Merge tag 'v1.0.12' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 30 Mar 2016 20:33:37 +0000 (16:33 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 30 Mar 2016 20:33:37 +0000 (16:33 -0400)
v1.0.12


Trivial merge