Sync'd branch integration/fx-team with upstream @ Sun Sep  7 08:54:11 PDT 2014