pre-merge
Merge branch 'master' of ssh://github.com/computerion/MapCache