Automated merge with https://code.google.com/p/amcat
Automated merge with https://code.google.com/p/amcat

amcat/amcat,tschmorleiz/amcat,tschmorleiz/amcat,amcat/amcat,amcat/amcat,amcat/amcat,tschmorleiz/amcat,amcat/amcat,amcat/amcat,tschmorleiz/amcat,tschmorleiz/amcat