up for WSD'12'2013
Merge branch 'master' into gh-pages