Merge branch 'hotfix/1.0.17' v1.0.17
authorLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 18:56:56 +0000 (14:56 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 18:56:56 +0000 (14:56 -0400)

Trivial merge