From b7dad91da2a0eb73088156b17b1f488e9a638b1b Mon Sep 17 00:00:00 2001
From: Nate Koenig <nkoenig@users.noreply.github.com>
Date: Tue, 1 Sep 2020 09:23:28 -0700
Subject: [PATCH 1/2] 2.3.3 release prep (#120)

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Louise Poubel <louise@openrobotics.org>
---
 CMakeLists.txt | 2 +-
 Changelog.md   | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1975db31..77f2cacb2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(ignition-gui2 VERSION 2.3.2)
+project(ignition-gui2 VERSION 2.3.3)
 
 #============================================================================
 # Find ignition-cmake
diff --git a/Changelog.md b/Changelog.md
index 83f2acb9f..74579097f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,12 @@
 ## Ignition Gui 2
 
-### Ignition Gui 2.X.X
+### Ignition Gui 2.3.3 (2020-08-31)
+
+1. Fix running plugins with bad world names.
+    * [Pull request 111](https://github.com/ignitionrobotics/ign-gui/pull/111)
+
+1. Disable more tests known to fail on macOS and Windows.
+    * [Pull request 112](https://github.com/ignitionrobotics/ign-gui/pull/112)
 
 ### Ignition Gui 2.3.2 (2020-08-19)
 

From 501f1926cae00ef77a12df7ebddbb0439671b114 Mon Sep 17 00:00:00 2001
From: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
Date: Wed, 4 Nov 2020 12:31:58 -0500
Subject: [PATCH 2/2] Resolve updated codecheck issues (#144)

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
---
 src/plugins/image_display/ImageDisplay.cc | 7 ++++++-
 src/plugins/scene3d/Scene3D.cc            | 4 +++-
 src/plugins/world_control/WorldControl.cc | 6 ++++--
 src/plugins/world_stats/WorldStats.cc     | 6 ++++--
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/plugins/image_display/ImageDisplay.cc b/src/plugins/image_display/ImageDisplay.cc
index 306f7c441..5bf921533 100644
--- a/src/plugins/image_display/ImageDisplay.cc
+++ b/src/plugins/image_display/ImageDisplay.cc
@@ -15,8 +15,14 @@
  *
 */
 
+#include "ImageDisplay.hh"
+
 #include <QQuickImageProvider>
+
+#include <algorithm>
 #include <iostream>
+#include <string>
+#include <vector>
 
 #include <ignition/common/Console.hh>
 #include <ignition/common/Image.hh>
@@ -24,7 +30,6 @@
 #include <ignition/transport/Node.hh>
 
 #include "ignition/gui/Application.hh"
-#include "ImageDisplay.hh"
 
 namespace ignition
 {
diff --git a/src/plugins/scene3d/Scene3D.cc b/src/plugins/scene3d/Scene3D.cc
index 1841ca5b4..19bfdbb12 100644
--- a/src/plugins/scene3d/Scene3D.cc
+++ b/src/plugins/scene3d/Scene3D.cc
@@ -15,6 +15,9 @@
  *
 */
 
+#include "Scene3D.hh"
+
+#include <algorithm>
 #include <cmath>
 #include <map>
 #include <sstream>
@@ -50,7 +53,6 @@
 #include <ignition/transport/Node.hh>
 
 #include "ignition/gui/Conversions.hh"
-#include "Scene3D.hh"
 
 namespace ignition
 {
diff --git a/src/plugins/world_control/WorldControl.cc b/src/plugins/world_control/WorldControl.cc
index e4983e6a1..95dc03a94 100644
--- a/src/plugins/world_control/WorldControl.cc
+++ b/src/plugins/world_control/WorldControl.cc
@@ -15,6 +15,10 @@
  *
 */
 
+#include "WorldControl.hh"
+
+#include <string>
+
 #include <ignition/common/Console.hh>
 #include <ignition/common/Time.hh>
 #include <ignition/common/StringUtils.hh>
@@ -22,8 +26,6 @@
 
 #include "ignition/gui/Helpers.hh"
 
-#include "WorldControl.hh"
-
 namespace ignition
 {
 namespace gui
diff --git a/src/plugins/world_stats/WorldStats.cc b/src/plugins/world_stats/WorldStats.cc
index f5a800bb1..0317212a7 100644
--- a/src/plugins/world_stats/WorldStats.cc
+++ b/src/plugins/world_stats/WorldStats.cc
@@ -15,6 +15,10 @@
  *
 */
 
+#include "WorldStats.hh"
+
+#include <string>
+
 #include <ignition/common/Console.hh>
 #include <ignition/common/StringUtils.hh>
 #include <ignition/common/Time.hh>
@@ -22,8 +26,6 @@
 
 #include "ignition/gui/Helpers.hh"
 
-#include "WorldStats.hh"
-
 namespace ignition
 {
 namespace gui