Merge tag 'v1.0.6' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 31 Oct 2016 20:09:14 +0000 (16:09 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 31 Oct 2016 20:09:14 +0000 (16:09 -0400)
v1.0.6


Trivial merge