Sync'd branch integration/fx-team with upstream @ Wed Nov 12 03:28:01 PST 2014