Cross merging master changes into Revit 2015

@ke-yu, please merge if this looks good to you.