Merge tag 'v1.1.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 18 Aug 2016 15:29:47 +0000 (11:29 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 18 Aug 2016 15:29:47 +0000 (11:29 -0400)
v1.1.17


Trivial merge