Merge from working-copy after update from mdipierro/lms299.