Sync'd branch integration/fx-team with upstream @ Mon Nov 10 00:40:03 PST 2014