Merge commit 'wbp/reveille' into Westminster_NSW_LEDcontrol