Merge branch 'release/2.4.0' v2.4.0
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 8 Aug 2016 16:21:02 +0000 (12:21 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 8 Aug 2016 16:21:02 +0000 (12:21 -0400)

Trivial merge