fixes 1801--better parser for question solutions

@sefk 

I tested this.  Going to pull it in myself