Sync'd branch integration/fx-team with upstream @ Sat Nov  8 01:58:00 PST 2014