Reverted to 6d29115b9b217fb7717c0ce9c106c1fa4e6e53b1
Merge branch 'master' of github.com:malmostad/global_assets