In Sync with ui-vagrant Repo
Merge remote-tracking branch 'origin/master'