Sync'd branch integration/fx-team with upstream @ Fri Aug 29 16:17:29 PDT 2014