Merge branch 'release/1.0.14' v1.0.14
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 25 Jul 2016 19:14:46 +0000 (15:14 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 25 Jul 2016 19:14:46 +0000 (15:14 -0400)

Trivial merge