Sync'd branch integration/fx-team with upstream @ Sun Nov  9 18:38:57 PST 2014