Merge upstream changes as of 2014.01.18