capture for display any errors generated by function macros
Merge branch 'master' of https://github.com/zenphoto/zenphoto