Merge remote-tracking branch 'upstream/develop' into develop

.widget.content overflow and height taken off