Sync'd branch integration/fx-team with upstream @ Fri Aug 29 11:48:28 PDT 2014