merge from 5e9a94f6046e92ee1cdd3da23b13f1d0204fc86d Fri Dec 6 22:20:28 2013 -0800