release version 2.2.4 on 2013-01-24_18-51-41
Merge branch 'upstream'