resync upstream on Wed Feb 20 17:16:08 MST 2013