Merging master into 'katello-installer' branch