Merge tag 'v1.2.14' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 27 Jul 2017 19:18:29 +0000 (15:18 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 27 Jul 2017 19:18:29 +0000 (15:18 -0400)
Version 1.2.14


Trivial merge