Merged in master

This updates the branch with most recent master. Do not forget to update the NuttX folder as well.