Merge tag 'v2.3.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Jul 2016 17:37:46 +0000 (13:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Jul 2016 17:37:46 +0000 (13:37 -0400)
Version 2.3.0


Trivial merge