Merge branches 'danjean' and 'master' into danjean