migrate fix for #13 into master.  apex metadata changes.