Merge change I11dc6200

* changes:
  Mark the next version as 0.6