comments in examples now match what examples actually do
Merge branches 'dev' and 'master'