Merge branch 'simplexml-comments'