Sync'd branch integration/fx-team with upstream @ Thu Oct 30 16:53:47 PDT 2014