Merge commit '254e00253ce72ee7252c26aab3a9ec6fb72e0542' * commit '254e00253ce72ee7252c26aab3a9ec6fb72e0542': Add support for XING header
Merge commit '254e00253ce72ee7252c26aab3a9ec6fb72e0542' * commit '254e00253ce72ee7252c26aab3a9ec6fb72e0542': Add support for XING header