Fix clash between free and paid, see issue #34
Version 2.7.2
Merge remote-tracking branch 'upstream/master'