Sync'd branch integration/fx-team with upstream @ Thu Oct 23 14:27:44 PDT 2014