merge of SIFTs Branch

No match.