Merge tag 'v1.0.6' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 29 Dec 2015 22:01:34 +0000 (17:01 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 29 Dec 2015 22:01:34 +0000 (17:01 -0500)
v1.0.6


Trivial merge