Update dev branch

@evancz this is just a merge commit that brings dev up-to-speed with master again.