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