Merge tag 'v1.1.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 14 Oct 2015 20:44:09 +0000 (16:44 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 14 Oct 2015 20:44:09 +0000 (16:44 -0400)
v1.1.17


Trivial merge