All relevant changes except the float/double one have been merged
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>