Merge branch 'hotfix-2.1.15'
Merge branch 'hotfix-2.1.15'
Merge branch 'hotfix-2.1.15'
Attachments correctly exported with events/view/1.xml now

- bug that broke transfer of attachments on pull fixed

- data only exported on view() not mass xml exports
Small cleanup
Merge branch 'hotfix-2.1.17' into develop