Merge branch 'release/1.2.21' v1.2.21
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Jul 2016 11:42:14 +0000 (07:42 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Jul 2016 11:42:14 +0000 (07:42 -0400)

Trivial merge