Merge tag 'v1.0.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jan 2016 16:35:04 +0000 (11:35 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jan 2016 16:35:04 +0000 (11:35 -0500)
Version 1.0.6


Trivial merge