Removed dependency to APFObject as tags MUST inherit Document.
ID#211: fixed wrong fallback mode definition.
Merge branch 'release-2.1'