Merge branch 'release/1.0.17' v1.0.17
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:46:38 +0000 (09:46 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:46:38 +0000 (09:46 -0400)

Trivial merge