Merge branch 'release/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Mon, 20 Feb 2017 16:47:02 +0000 (11:47 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 20 Feb 2017 16:47:02 +0000 (11:47 -0500)

Trivial merge