Merge branch 'release/1.0.16' v1.0.16
authorLaury GvR <laury@gaslightmedia.com>
Wed, 22 Feb 2017 15:48:51 +0000 (10:48 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 22 Feb 2017 15:48:51 +0000 (10:48 -0500)

Trivial merge