Merge tag 'v1.0.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Jun 2015 17:00:02 +0000 (13:00 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Jun 2015 17:00:02 +0000 (13:00 -0400)
Version 1.0.6


Trivial merge