Ignore .ii files
Merge branch 'maint'

* maint:
  Ignore .ii files
Merge branch 'master' into next

* master:
  Ignore .ii files