Merge tag 'v1.0.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jan 2016 16:35:24 +0000 (11:35 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jan 2016 16:35:24 +0000 (11:35 -0500)
v1.0.17


Trivial merge