Merge branch 'release/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Wed, 28 Oct 2015 15:12:50 +0000 (11:12 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 28 Oct 2015 15:12:50 +0000 (11:12 -0400)

Trivial merge