Sync'd branch integration/fx-team with upstream @ Wed Oct 22 09:09:54 PDT 2014