Revert "Change version back to 6.0" am: 55a149b740 am: 550b317688
am: 7b67e0dd73  -s ours

* commit '7b67e0dd73766dcceb77fa08ae2d8da1341b3c87':
  Revert "Change version back to 6.0"