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