Merge branch 'hotfix/1.2.11' v1.2.11
authorLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:06:24 +0000 (13:06 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:06:24 +0000 (13:06 -0500)

Trivial merge