Fix clip() macro

Looks like I swapped the maximum and minimum values in the clip() macro by
accident.
Merge branch 'carlos_cleanup' into axis_info_change