Merge branch 'release/1.5.0' v1.5.0
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Feb 2016 20:20:30 +0000 (15:20 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Feb 2016 20:20:30 +0000 (15:20 -0500)

Trivial merge