Sync'd branch integration/fx-team with upstream @ Fri Aug 29 07:55:35 PDT 2014