Merge branch 'cfoster-master'
Merge branch 'master' of https://github.com/xquery/rxq
minor code reformatting
Merge branch 'master' of https://github.com/xquery/rxq