merge master
merge master

fplll/fplll,fplll/fplll,dstehle/fplll,cr-marcstevens/fplll,fplll/fplll,cr-marcstevens/fplll,dstehle/fplll,dstehle/fplll,fplll/fplll,cr-marcstevens/fplll,cr-marcstevens/fplll,fplll/fplll