Martin Konecny aecee0574d Random commits gathered and put into one
-since we had an accidental merge between devel and 2.1.x, I'm rounding
up these changes that need to be in 2.1.x and putting them here.
2012-07-09 18:58:22 -04:00
..
2012-04-19 16:35:19 -04:00
2012-06-28 16:16:02 -04:00