Sync'd branch integration/fx-team with upstream @ Wed Oct  8 16:32:41 PDT 2014