Cross merge master into Revit2015

@Benglin, @junmendoza please check your change is ok.