[gcr] (3 commits) Non-fast-forward update to branch wip/smcv/timeout

[Simon McVittie <smcv src gnome org>]

The branch 'wip/smcv/timeout' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  2cfd71c... Increase test-gnupg-collection timeout

Commits added to the branch:

  0629160... Use python3 shebang in ui/icons/render-icons.py (*)
  105b47d... Merge branch 'wip/smcv/python3' into 'master' (*)
  7a83510... Increase test-gnupg-collection timeout

(*) This commit already existed in another branch; no separate mail sent