Merge "Enable atspi" into devel/master