Sync'd branch integration/fx-team with upstream @ Thu Sep 18 01:59:38 PDT 2014