Sync'd branch integration/fx-team with upstream @ Wed Oct 22 20:05:52 PDT 2014