Merge branch 'triple_dash' into 'master'