import master commits

updating unstable with recent changes to master