Merged d95fe6a9c302d7fb47b8dded5f1eeb647a87132b

This change was previously overwritten when latest adaptlearning code
was merged back in.