Sync'd branch integration/fx-team with upstream @ Sat Nov  8 11:33:04 PST 2014