Merge branch 'release/1.2.17' V1.2.17
authorLaury GvR <laury@gaslightmedia.com>
Mon, 22 May 2017 14:43:58 +0000 (10:43 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 22 May 2017 14:43:58 +0000 (10:43 -0400)

Trivial merge