Fine tunig billable and tags flag positions (osx)
Merge branch 'master' into builds
7.661