Merge tag 'v1.0.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 14 Jan 2016 21:44:57 +0000 (16:44 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 14 Jan 2016 21:44:57 +0000 (16:44 -0500)
Version 1.0.6


Trivial merge