Merge Unstable branch with Master

Update master to latest code.