Use hash-tag regexp consistently.
Merge remote-tracking branch 'ghubber/master'