Merged /branches/i-campbell [#11]
Started merging branches/i-campbell back into trunk
import of fresh version