Merge tag 'v1.0.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 6 Mar 2015 14:21:21 +0000 (09:21 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 6 Mar 2015 14:21:21 +0000 (09:21 -0500)
Version 1.0.6


Trivial merge