merge juanma
Merge remote-tracking branch 'origin/master' into juanma_tasks
fix error links