Merge branch 'hotfix/1.2.12' v1.2.12
authorLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:17:56 +0000 (13:17 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:17:56 +0000 (13:17 -0500)

Trivial merge