Merge pull request #1118 from totten/master-apientities