Michael Beck - 2011-11-14

Done in SVN and waiting for review before merging to the trunk.