Big merge from bruno's branch, more info below#989

brunofavs wants to merge 5 commits intonoetic-devellardemua/atom:noetic-develfrom

bruno_mergelardemua/atom:bruno_mergeCopy head branch name to clipboard