Merge tag 'v1.5.11' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Apr 2017 14:37:41 +0000 (10:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Apr 2017 14:37:41 +0000 (10:37 -0400)
Version 1.5.11


Trivial merge