Sync'd branch integration/fx-team with upstream @ Thu Sep 25 03:30:40 PDT 2014