Merge tag 'v1.2.17' into develop develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 25 Aug 2017 20:06:16 +0000 (16:06 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 25 Aug 2017 20:06:16 +0000 (16:06 -0400)
Version 1.2.17


Trivial merge