Retrieving keys from an INSERT may work now. (Untested)
Merge origin/master