Sync'd branch integration/fx-team with upstream @ Fri Aug 29 15:50:38 PDT 2014