Merge tag 'v1.0.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Oct 2014 17:19:39 +0000 (13:19 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Oct 2014 17:19:39 +0000 (13:19 -0400)
Version 1.0.6


Trivial merge