Merge branch 'hotfix/1.2.16' v1.2.16
authorLaury GvR <laury@gaslightmedia.com>
Fri, 11 Dec 2015 19:52:21 +0000 (14:52 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 11 Dec 2015 19:52:21 +0000 (14:52 -0500)

Trivial merge