Sync'd branch integration/fx-team with upstream @ Fri Nov  7 11:51:47 PST 2014