Merge tag 'v1.0.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 14:21:26 +0000 (10:21 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 14:21:26 +0000 (10:21 -0400)
v1.0.17


Trivial merge