Sync'd branch integration/fx-team with upstream @ Wed Aug 27 11:46:37 PDT 2014