Merge tag 'v1.0.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 18:57:01 +0000 (14:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 18:57:01 +0000 (14:57 -0400)
v1.0.17


Trivial merge