Merge remote-tracking branch 'jnormore/vine_user'