ENH: performance branch merge


git-svn-id: https://svn.bigr.nl/elastix/trunkpublic@4653 4d348492-3962-11de-aa85-65a2020054a3