fix #584#630

antoniosanct wants to merge 8 commits into

rometools:masterrometools/rome:masterfrom

antoniosanct:rome_584antoniosanct/rome:rome_584Copy head branch name to clipboard