merge master into 0.2.x (fix git issue)