Merge remote-tracking branch 'armstrong/master'

latest commit c40f9b0a48
@tswicegood tswicegood authored