Merge branch 'joshvillbrandt-master'