Merge remote branch 'ysuarez/master' into github_online