Merged master, fixed conflict in www-srv/src/datacache.py.