Merge tag 'v1.0.6' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 28 Jul 2016 17:58:34 +0000 (13:58 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 28 Jul 2016 17:58:34 +0000 (13:58 -0400)
version 1.0.6


Trivial merge