moved hr...
Merge branch 'master' into sqlce