Sync'd branch integration/fx-team with upstream @ Sat Nov  8 02:16:52 PST 2014