Merge tag 'v1.0.12' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 20 Jan 2016 14:03:10 +0000 (09:03 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 20 Jan 2016 14:03:10 +0000 (09:03 -0500)
v1.0.12


Trivial merge