Merge pull request #34 from apache/dev

merge dev in master (after 13 months without merge)