Merge tag 'v1.1.12' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 21:02:08 +0000 (17:02 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 21:02:08 +0000 (17:02 -0400)
v1.1.12


Trivial merge