Merge pull request #24 from apache/wu-sheng-patch-1

Make merge policy strict