Merge tag 'v1.0.6' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 28 Oct 2015 15:12:58 +0000 (11:12 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 28 Oct 2015 15:12:58 +0000 (11:12 -0400)
v1.0.6


Trivial merge