Sync'd branch integration/fx-team with upstream @ Mon Nov 10 07:13:07 PST 2014