Commit 6b4e0850 authored by Tommy Yu's avatar Tommy Yu
Browse files

Merge branch 'issue_29' into 1.2.x

parents dc8d7a74 5d07e606