upstream/2.5.0
9e5649bf · New upstream version 2.5.0+git20160929.0.86cef3e4 ·