Sync'd branch integration/fx-team with upstream @ Wed Nov 12 16:55:57 PST 2014