rephrase changes a bit
Bump version to 1.16
Merge branch 'master' into feed
wip