0727cc1 fix build failure due to clash of bitwise defines

Authored and Committed by thaller 7 years ago
    fix build failure due to clash of bitwise defines
    
    Also fixup the changelog for past release versions.
    
        
file modified
+8 -5