/branches/stable
Merge bugfixes and enhancements needed for IPDB integration since 1.2.4 forward from /trunk