Merge branch 'hotfix/2.1.20' v2.1.20
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 19:05:11 +0000 (15:05 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 19:05:11 +0000 (15:05 -0400)
commitaf94bf8ec69133c3151c308044edc017cc1dda10
treedc5d283efdf58667d0b0dfbbb94b4ba6cd1dc9c9
parentc6960ac71141e9b49c0908cbf7c3df4a5ddc1239
parentecdbccfb0826bdd703bb8cafa018581321c43034
Merge branch 'hotfix/2.1.20'