Merge branch 'release/1.2.13' v1.2.13
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 25 May 2017 18:06:35 +0000 (14:06 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 25 May 2017 18:06:35 +0000 (14:06 -0400)

Trivial merge