Merged in latest changes from the trunk

git-svn-id: http://svn.code.sf.net/p/mrbs/code/mrbs/branches/this_and_future@2725 25f7e783-145e-4f2d-a9f8-dd7182bfe9c7