Merge tag 'v1.0.17' into develop
authorIan Weller <ian@gaslightmedia.com>
Tue, 3 May 2016 15:17:11 +0000 (11:17 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 3 May 2016 15:17:11 +0000 (11:17 -0400)
version 1.0.17


Trivial merge