Merge commit 'kumar/next' into merge

[ upstream commit: 59603b9ae426e968d452f9325cdcff308573dee7 ]
tree: d4b96a5a27e94ee9b9ada66e59fec5c14b49c8e2
  1. src/
  2. COPYING