Merge branch 'dev'

matching change in development pattern with upstream.
Merge github.com:aaren/lab-waves

pull down upstream as part of reorganisation.