Merge branch 'release/1.1.17' v1.1.17
authorLaury GvR <laury@gaslightmedia.com>
Wed, 14 Oct 2015 20:44:01 +0000 (16:44 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 14 Oct 2015 20:44:01 +0000 (16:44 -0400)

Trivial merge