Merge branch 'release/1.1.13' v1.1.13
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 23 Mar 2017 19:41:57 +0000 (15:41 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 23 Mar 2017 19:41:57 +0000 (15:41 -0400)

Trivial merge