Merge branch 'release/1.2.13' master v1.2.13
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Jun 2017 17:28:58 +0000 (13:28 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Jun 2017 17:28:58 +0000 (13:28 -0400)

Trivial merge