update to current upstream commit as of 130514