Merge commit 'chlamydia/master'