Fix Liberty support

Álvaro López García requested to merge github/fork/alvarolopez/enol_stable_liberty into stable/liberty Mar 07, 2016