Sync'd branch integration/fx-team with upstream @ Thu Sep  4 13:47:37 PDT 2014