Merge remote-tracking branch 'jtwaleson/master'