ExNihilo - v1.31

Initial commit, merged from 1.6 branch (including recent changes)