Sources from SVN

Release 1.2.1