Merge tag 'v1.2.14' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 16:10:55 +0000 (12:10 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 16:10:55 +0000 (12:10 -0400)
Version 1.2.14


Trivial merge