Merge master into Revit2015

@Benglin, please merge this one.