Sync'd branch integration/fx-team with upstream @ Fri Aug 22 17:12:38 PDT 2014