Merge in old fixes
update bower tag