update-suggestions #1

Open
vlab wants to merge 2 commits from update-suggestions into master