Sync'd branch integration/fx-team with upstream @ Tue Sep  9 02:16:38 PDT 2014