Reset
Merge branch 'master' into DanielAlbarral