Merge branch 'hotfix/1.1.16' V1.1.16
authorLaury GvR <laury@gaslightmedia.com>
Thu, 3 Dec 2015 17:32:29 +0000 (12:32 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 3 Dec 2015 17:32:29 +0000 (12:32 -0500)

Trivial merge