merged master into mojotech promise commits