merge r39050 from mri
Merge pull request #18 from zzak/merge_downstream

merge r39050 from mri