Attempting to resolve conflicts between 'dev' and 'master' and merge
'dev' into 'master'