Merge tag 'v1.0.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 22 Sep 2014 15:20:47 +0000 (11:20 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 22 Sep 2014 15:20:47 +0000 (11:20 -0400)
Version 1.0.6


Trivial merge