Merge of master into vagrant