IA update branch 2014 06 30

This is an IA-sync update branch. I brought UKWA up to date with IIPC, merged in upstream changes from IA on a new branch, and pushed it up here. If all is okay, accepting this should bring us up to date with IA's fork.