git ignores pycharm's .idea folder
invalid match between cube shape and CTM grid shape is not critical
Merge remote-tracking branch 'origin/bpch' into bpch

Conflicts:
	lib/iris/fileformats/bpch_load_rules.py