Merge branch 'hotfix/1.2.20'
Merge branch 'release/1.3.0'
Merge branch 'release/1.3.1'
Merge branch 'release/1.4.0'
Merge branch 'release/1.4.1'
trying upstream changes for installing taglib
trying upstream changes for installing taglib
Merge branch 'hotfix/1.4.2' of github.com:fusion2004/compo into hotfix/1.4.2

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'hotfix/1.4.2' into develop