Add support for Optional by implementing an extra ELResolver
Merge remote-tracking branch 'origin/master'