partially merged #36
Merge branch 'master' into upcoming-0.27-20121116