Merge commit '7087c8de43b0d5d27c52da6ba2ba4957b7e336ff' into new_merge
Import libxo 0.1.4 Obtained from: https://github.com/Juniper/libxo Sponsored by: Juniper Networks, Inc.