Oops, re-merge: https://github.com/Polymer/CustomElements/pull/122