Merge pull request #63 from apache/tasks/merge-extra-commits-on-rel-branch-to-master

Tasks/merge extra commits on rel branch to master