Merge "Fixes some alignment issues." into devel/master