Merge remote-tracking branch 'qatar/release/0.6' into release/0.6

      * qatar/release/0.6:
  Release notes and changelog for 0.6.4

Conflicts:
	Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>