Bugs 20170210 aaronw
Created by: agwells
Hi Alexey,
I found a couple of bugs while testing your revisions. I thought the easiest thing is probably for me to fix them myself and put them into another merge request. Can you give these a once-over?
Cheers, Aaron