Merge branch 'refs/heads/map_title_to_attributes'

Signed-off-by: Bert Hajee <hajee@moretIA.com>

Conflicts:
	Modulefile