Initial import of trunk (v1.3)