Merge djrbliss:master into refs/heads/master

update upstream into branch