Merge final v1.1.0 updates from master in to develop