Ignore xml for ack-grep
Merge from master