Merge tag 'v1.0.17' into develop
authorIan Weller <ian@gaslightmedia.com>
Mon, 5 Jun 2017 17:26:40 +0000 (13:26 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 5 Jun 2017 17:26:40 +0000 (13:26 -0400)
version 1.0.17


Trivial merge