Merge tag 'v1.0.6.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 22 Sep 2014 15:43:37 +0000 (11:43 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 22 Sep 2014 15:43:37 +0000 (11:43 -0400)
Version 1.0.6.2


Trivial merge