Merge tag 'v1.0.12' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 10 Feb 2016 15:57:49 +0000 (10:57 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 10 Feb 2016 15:57:49 +0000 (10:57 -0500)
v1.0.12


Trivial merge