Add lib back in
Merge branch 'master' into STABLE