Sync-up with upstream pocketsphinx