Sync'd branch integration/fx-team with upstream @ Sat Aug 30 15:34:34 PDT 2014