Merge tag 'v1.2.17' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jul 2016 19:47:43 +0000 (15:47 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jul 2016 19:47:43 +0000 (15:47 -0400)
Version 1.2.17


Trivial merge