Merge tag 'v1.0.12' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 28 Feb 2017 15:45:06 +0000 (10:45 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 28 Feb 2017 15:45:06 +0000 (10:45 -0500)
v1.0.12


Trivial merge