Merge 'eel' into 'master'