Merge tag 'v1.0.6' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 20 Feb 2017 16:47:08 +0000 (11:47 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 20 Feb 2017 16:47:08 +0000 (11:47 -0500)
v1.0.6


Trivial merge