Merge tag 'v2.1.20' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 19:05:18 +0000 (15:05 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 19:05:18 +0000 (15:05 -0400)
Version 2.1.20


Trivial merge