Merge tag 'v1.1.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 10 Aug 2016 20:48:50 +0000 (16:48 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 10 Aug 2016 20:48:50 +0000 (16:48 -0400)
Version 1.1.5


Trivial merge