merge master changes

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>