Merge branch 'release/1.0.17' v1.0.17
authorLaury GvR <laury@gaslightmedia.com>
Thu, 12 Jan 2017 22:25:04 +0000 (17:25 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 12 Jan 2017 22:25:04 +0000 (17:25 -0500)

Trivial merge