Merge tag 'v1.0.17' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 20:10:52 +0000 (16:10 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 20:10:52 +0000 (16:10 -0400)
Version 1.0.17


Trivial merge