Sync'd branch integration/fx-team with upstream @ Sat Aug 30 04:29:05 PDT 2014