Build 20130507.1

This build contains some minor enhancements and bugfixes.