Merge "Change VAO hash value function" into devel/master