Merge pull request #5329 from totten/master-bower-fch