Sync'd branch integration/fx-team with upstream @ Wed Nov 12 23:32:08 PST 2014