trunk (SVN/UNRELEASED)