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


Trivial merge