Polymer 0.4.0 upgrade