Merge branch 'hotfix/1.2.5' v1.2.5
authorLaury GvR <laury@gaslightmedia.com>
Tue, 13 Sep 2016 16:27:57 +0000 (12:27 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 13 Sep 2016 16:27:57 +0000 (12:27 -0400)

Trivial merge