Merge tag 'v1.5.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Oct 2016 13:44:47 +0000 (09:44 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Oct 2016 13:44:47 +0000 (09:44 -0400)
Version 1.5.0


Trivial merge