2014-12-29 update merged prs