5 trunk

@pamval: works on my box and with the plugin samples, but please review.