Sync'd branch integration/fx-team with upstream @ Wed Sep 17 01:16:40 PDT 2014