Merge tag 'v1.1.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 20:27:06 +0000 (16:27 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 20:27:06 +0000 (16:27 -0400)
v1.1.17


Trivial merge