Merge tag 'v1.0.16' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 5 Jan 2016 22:00:48 +0000 (17:00 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 5 Jan 2016 22:00:48 +0000 (17:00 -0500)
v1.0.16


Trivial merge