integrated branches/i-campbell into trunk
Started merging branches/i-campbell back into trunk
import of fresh version