Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 6 Mar 2015 14:21:01 +0000 (09:21 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 6 Mar 2015 14:21:01 +0000 (09:21 -0500)

Trivial merge