Merge branch 'hotfix/1.2.13' v1.2.13
authorLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:27:35 +0000 (13:27 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:27:35 +0000 (13:27 -0500)

Trivial merge