Merge branch 'release/1.0.17' v1.0.17
authorLaury GvR <laury@gaslightmedia.com>
Fri, 14 Apr 2017 20:42:17 +0000 (16:42 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 14 Apr 2017 20:42:17 +0000 (16:42 -0400)

Trivial merge