Merge branch 'master' into vplyashkun/valgrind