Merge branch 'long' into 'master'