Merge tag 'v1.2.15' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 14 Jun 2017 18:50:56 +0000 (14:50 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 14 Jun 2017 18:50:56 +0000 (14:50 -0400)
Version 1.2.15


Trivial merge