Merge branch 'master'
[mmh] / DATE
1 2012-12-08