Merge test 2014 upstream

DO NOT EVER MERGE THIS! JUST USED TO COMPARE OUR LOCAL DIFF AGAINST UPSTREAM