Fixes for March 2013 bug week (rebased onto develop)



This is the same as gh-408 but rebased onto develop.

----