rebase with upstream release 0.34
    
    bz #2014519
    
    This is a built without the new s-expression feature since the fsexpr
    library is not available in Fedora.