Merge branch 'master' into #571
Merge branch '#571' into #581