Merge tag 'v1.0.16' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 13 Jun 2016 17:42:31 +0000 (13:42 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 13 Jun 2016 17:42:31 +0000 (13:42 -0400)
v1.0.16


Trivial merge