Merge commit '55c27b8ebc95509dc0cb52673f022fe63675af32'
Merge commit '2883632b3702cab76c6356ad143fe644f8c47e97'
writing XML
Merge branch 'master' into solution