Merge changes I92cea061,I67705c5c

* changes:
  Add spaces around := when dumping assignments
  Fix govet issue