Sync'd branch integration/fx-team with upstream @ Wed Aug 27 16:17:21 PDT 2014