up to date
Merge branch 'master' into sheer-api
merge permalinks changes