auto-merge staging into master
Fixed infinite loop