Khan/khan-exercises — pull request #62419 by petercollingridge (2013-08-19 17:35:01+00:00)
Title: Fix bug and tidy

Fix #61174, #58962