update to 1.1.6-SNAPSHOT
Merge branch 'master' into filterconfig