...
Merge remote-tracking branch 'cmbennett/master'
JUnit test copy and pasted from cmbennett