Merge tag 'v1.2.14' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 14 Jun 2017 16:43:55 +0000 (12:43 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 14 Jun 2017 16:43:55 +0000 (12:43 -0400)
Version 1.2.14


Trivial merge