Merge commits from qvitter 6.10.14