Merge "allow rotation-vector to have 4 components" into gingerbread