upstream/8.4.2-261024

Bernd Zeimetz

@bzed

66d86a71 · Imported Upstream version 8.4.2-261024 · Jan 06, 2014

Upstream version 8.4.2-261024