Sync'd branch integration/fx-team with upstream @ Thu Oct  2 02:09:40 PDT 2014