Merge "Documentation cleanup." into devel/master