Merge pull request #3722 from jmarshallnz/no_nagging