Merge tag 'v1.0.12' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 15:57:07 +0000 (11:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 15:57:07 +0000 (11:57 -0400)
v1.0.12


Trivial merge