start on static-network-up, not stopped networking, because that won't work with Raring
merge with master