Sync'd branch integration/fx-team with upstream @ Sun Sep  7 19:01:36 PDT 2014