Merge tag 'v1.0.18' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 17 Feb 2016 14:42:37 +0000 (09:42 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 17 Feb 2016 14:42:37 +0000 (09:42 -0500)
Version 1.0.18


Trivial merge