Merge branch 'hotfix/1.1.17' V1.1.17
authorLaury GvR <laury@gaslightmedia.com>
Thu, 3 Dec 2015 19:15:11 +0000 (14:15 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 3 Dec 2015 19:15:11 +0000 (14:15 -0500)

Trivial merge