Update for new bootstrap version
Merge branch 'hydra-head-7' of github.com:avalonmediasystem/avalon into hydra-head-7