Merge tag 'v1.0.6' into develop
authorIan Weller <ian@gaslightmedia.com>
Wed, 22 Feb 2017 19:31:59 +0000 (14:31 -0500)
committerIan Weller <ian@gaslightmedia.com>
Wed, 22 Feb 2017 19:31:59 +0000 (14:31 -0500)
version 1.0.6


Trivial merge