updates for 9/12

Signed-off-by: Per Jonasson <per@webable.se>