Merge tag 'v2.1.17' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 13:17:24 +0000 (09:17 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 13:17:24 +0000 (09:17 -0400)
Version 2.1.17


Trivial merge