Port to Velocity#4

Eufranio wants to merge 2 commits intovoidstarr:mastervoidstarr/Altimeter:masterfrom

Eufranio:masterEufranio/Altimeter:masterCopy head branch name to clipboard