2013/04/02 Version 3.0, fix 20130402a - bug fixes.
Merge branch 'hotfix/3.0-20130402'