Merge tag 'v1.0.17' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Feb 2016 21:19:37 +0000 (16:19 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Feb 2016 21:19:37 +0000 (16:19 -0500)
Version 1.0.17


Trivial merge