Sync'd branch integration/fx-team with upstream @ Sun Sep  7 02:55:02 PDT 2014