Sync'd branch integration/fx-team with upstream @ Mon Aug 25 13:08:36 PDT 2014