Merge tag 'v1.0.18' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Feb 2016 21:47:06 +0000 (16:47 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Feb 2016 21:47:06 +0000 (16:47 -0500)
Version 1.0.18


Trivial merge