Fix for empty $x_libraries
Merge branch 'master' into remove_subimage