Merge commit 'coling/master'