Update after the conf call on 2013-05-22

Signed-off-by: iptc <mdirector@iptc.org>