Merge tag 'v1.0.18' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 20:42:07 +0000 (16:42 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 20:42:07 +0000 (16:42 -0400)
Version 1.0.18


Trivial merge