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