Sync'd branch integration/fx-team with upstream @ Thu Oct 16 11:02:54 PDT 2014