Merge branch 'release/1.2.14' v1.2.14
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 16:10:46 +0000 (12:10 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 16:10:46 +0000 (12:10 -0400)

Trivial merge