Merge tag 'v1.2.11' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Apr 2017 16:14:46 +0000 (12:14 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Apr 2017 16:14:46 +0000 (12:14 -0400)
Version 1.2.11


Trivial merge