Merge tag 'v2.0.17' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Jun 2017 19:13:13 +0000 (15:13 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Jun 2017 19:13:13 +0000 (15:13 -0400)
version 2.0.17


Trivial merge