changed word 'actual' to 'current'
Merge branch 'master' into UNNAMED_DEV