Merge pull request #963 from apache/dev

Dev: merge dev commits into master