app.nlp.load: cleaning up the ACE loader
Merge remote-tracking branch 'upstream/master'