Merge branch 'hotfix/1.2.10' v1.2.10
authorLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:00:23 +0000 (13:00 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:00:23 +0000 (13:00 -0500)

Trivial merge