Merge tag 'v1.0.6' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 10 Jun 2015 15:14:03 +0000 (11:14 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 10 Jun 2015 15:14:03 +0000 (11:14 -0400)
v1.0.6


Trivial merge