update to work with latest polymer master