Merge tag 'v1.0.17' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 5 Nov 2015 21:39:31 +0000 (16:39 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 5 Nov 2015 21:39:31 +0000 (16:39 -0500)
Version 1.0.17


Trivial merge