Merge tag 'v1.3.11' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jan 2016 20:43:08 +0000 (15:43 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jan 2016 20:43:08 +0000 (15:43 -0500)
Version 1.3.11


Trivial merge