Sync'd branch integration/fx-team with upstream @ Sat Aug 30 11:55:33 PDT 2014