Merge branch 'release/1.5.0' v1.5.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Oct 2016 13:44:42 +0000 (09:44 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Oct 2016 13:44:42 +0000 (09:44 -0400)

Trivial merge