post 6.0.3
Merge branch '60'
post merge, this might be bad =(