Merge remote-tracking branch 'origin/master' into HEAD

Change-Id: I759409bd40f8377e1d2fd5ce0b16ece6dd0bb764
use stompy rather than stomp.py :'-(

Change-Id: Iee93b40e364e2b0aed776a884742189af4aa327f
Merge remote-tracking branch 'origin/master' into HEAD