sample config updated to less variable
Merge branch '3.0' into 3.1