Merge master to 0.6.x branch (fixed git issue)