Merge "fix a bug where FLIP_H would do a 180 rotation" into gingerbread