Sync'd branch integration/fx-team with upstream @ Fri Aug 22 15:30:33 PDT 2014