Merge branch 'release/2.3.0' v2.3.0
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Jul 2016 17:37:40 +0000 (13:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Jul 2016 17:37:40 +0000 (13:37 -0400)

Trivial merge