Merged and fixed branch 201212 into master