Merge changes by d00fy to master

These changes were merged into fuerte last month.
This requests merges them to master.