Merge branch 'hotfix/1.0.16' v1.0.16 v1.0.17
authorLaury GvR <laury@gaslightmedia.com>
Thu, 4 Feb 2016 15:18:16 +0000 (10:18 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 4 Feb 2016 15:18:16 +0000 (10:18 -0500)

Trivial merge