Backward port to 5.5
Merge branch 'master' of github.com:concat/assets