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

Trivial merge