Merge tag 'v1.0.6' into develop develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 20 Jun 2016 16:10:13 +0000 (12:10 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 20 Jun 2016 16:10:13 +0000 (12:10 -0400)
v1.0.6


Trivial merge