Sync'd branch integration/fx-team with upstream @ Sun Nov  9 00:37:52 PST 2014