Merge branch 'release/1.2.20' v1.2.20
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Jul 2016 17:41:27 +0000 (13:41 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Jul 2016 17:41:27 +0000 (13:41 -0400)

Trivial merge