Test code for empty model abort.
Fix obvious bug
Merge branch 'master' into empty_model_abort
Merge branch 'master' into empty_model_abort
Nonzero minimum size for "empty" models.
Merge branch 'master' into empty_model_abort
Merge branch 'master' into empty_model_abort
Merge branch 'master' into empty_model_abort