bugfix: divide action queue discard mark by 10 - was out of range
Merge branch 'v5-stable' into v6-stable

Conflicts:
	action.c
	queue.c (some code moved from action.c --> queue.c)
Merge branch 'v6-stable'
Merge remote-tracking branch 'milan/imjournal' into master-imjournal
imjournal: streamline build system a bit

... most importantly the configure switch is no longer --enable-journal
but --enable-imjournal (as we now also have omjournal!)