Merge branch 'hotfix/1.0.17' v1.0.17
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jan 2016 16:35:18 +0000 (11:35 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jan 2016 16:35:18 +0000 (11:35 -0500)

Trivial merge