Revision 721146

FELIX-824 Applied slightly modified patch by Thijs Metsch (Thanks)
Modifications are some minor reformatting, slight change in how the
Reference object field is set from the tag and ensuring the field is
written to the private descriptor file required for extensibility