Merge tag 'v1.0.17' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Mar 2015 12:25:49 +0000 (08:25 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Mar 2015 12:25:49 +0000 (08:25 -0400)
Version 1.0.17


Trivial merge