Merge branch 'release/1.5.0' v1.5.0
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 May 2016 12:43:38 +0000 (08:43 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 May 2016 12:43:38 +0000 (08:43 -0400)

Trivial merge