Merge tag 'v1.0.12' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 1 Mar 2016 17:43:36 +0000 (12:43 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 1 Mar 2016 17:43:36 +0000 (12:43 -0500)
v1.0.12


Trivial merge