am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter"

* commit 'e7f7af964baa3c5d36abd163e33ad139310049d2':
  take account of RotationVector's new extra parameter