[v4.2-import] Recent additions to V4.2
Merge pull request #360 from paparazzi/recent_addition_to_v4.2

minor updates from stable v4.2