Sync'd branch integration/fx-team with upstream @ Wed Sep 10 03:57:40 PDT 2014