Merge tag 'v1.1.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Apr 2016 20:49:48 +0000 (16:49 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Apr 2016 20:49:48 +0000 (16:49 -0400)
Version 1.1.5


Trivial merge