* No static blocks anymore
Merge remote-tracking branch 'origin/master'

Conflicts:
	net/sourceforge/javafpdf/FPDF.java