commit 1 from stinger
Merge origin/master