diff --git a/extras/Projucer/JuceLibraryCode/BinaryData.cpp b/extras/Projucer/JuceLibraryCode/BinaryData.cpp
index 3e796febb1..dbebab8c6e 100644
--- a/extras/Projucer/JuceLibraryCode/BinaryData.cpp
+++ b/extras/Projucer/JuceLibraryCode/BinaryData.cpp
@@ -6192,7 +6192,7 @@ static const unsigned char temp_binary_data_35[] =
 "public:\r\n"
 "    //==============================================================================\r\n"
 "    %%class_name%% (%%constructor_params%%);\r\n"
-"    ~%%class_name%%();\r\n"
+"    ~%%class_name%%() override;\r\n"
 "\r\n"
 "    //==============================================================================\r\n"
 "    //[UserMethods]     -- You can add your own custom methods in this section.\r\n"
@@ -7846,7 +7846,7 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes)
         case 0x51b49ac5:  numBytes = 6036; return jucer_AudioPluginFilterTemplate_cpp;
         case 0x488afa0a:  numBytes = 2272; return jucer_AudioPluginFilterTemplate_h;
         case 0xabad7041:  numBytes = 2126; return jucer_ComponentTemplate_cpp;
-        case 0xfc72fe86:  numBytes = 2042; return jucer_ComponentTemplate_h;
+        case 0xfc72fe86:  numBytes = 2051; return jucer_ComponentTemplate_h;
         case 0x1657b643:  numBytes = 1693; return jucer_ContentCompSimpleTemplate_h;
         case 0x0b66646c:  numBytes = 1190; return jucer_ContentCompTemplate_cpp;
         case 0x6fa10171:  numBytes = 1071; return jucer_ContentCompTemplate_h;
diff --git a/extras/Projucer/JuceLibraryCode/BinaryData.h b/extras/Projucer/JuceLibraryCode/BinaryData.h
index 1f027de67c..d9311d3671 100644
--- a/extras/Projucer/JuceLibraryCode/BinaryData.h
+++ b/extras/Projucer/JuceLibraryCode/BinaryData.h
@@ -114,7 +114,7 @@ namespace BinaryData
     const int            jucer_ComponentTemplate_cppSize = 2126;
 
     extern const char*   jucer_ComponentTemplate_h;
-    const int            jucer_ComponentTemplate_hSize = 2042;
+    const int            jucer_ComponentTemplate_hSize = 2051;
 
     extern const char*   jucer_ContentCompSimpleTemplate_h;
     const int            jucer_ContentCompSimpleTemplate_hSize = 1693;
diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_ComponentTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_ComponentTemplate.h
index d47a398799..780bdc624b 100644
--- a/extras/Projucer/Source/BinaryData/Templates/jucer_ComponentTemplate.h
+++ b/extras/Projucer/Source/BinaryData/Templates/jucer_ComponentTemplate.h
@@ -38,7 +38,7 @@
 public:
     //==============================================================================
     %%class_name%% (%%constructor_params%%);
-    ~%%class_name%%();
+    ~%%class_name%%() override;
 
     //==============================================================================
     //[UserMethods]     -- You can add your own custom methods in this section.
diff --git a/extras/Projucer/Source/ComponentEditor/PaintElements/jucer_PaintElementImage.cpp b/extras/Projucer/Source/ComponentEditor/PaintElements/jucer_PaintElementImage.cpp
index 5b6a4a4f51..0ab742211d 100644
--- a/extras/Projucer/Source/ComponentEditor/PaintElements/jucer_PaintElementImage.cpp
+++ b/extras/Projucer/Source/ComponentEditor/PaintElements/jucer_PaintElementImage.cpp
@@ -145,8 +145,8 @@ void PaintElementImage::fillInGeneratedCode (GeneratedCode& code, String& paintM
                 else
                     r << "    g.setColour (Colours::black.withAlpha (" << CodeHelpers::floatLiteral (opacity, 3) << "));\n";
 
-                r << "    jassert (" << imageVariable << " != 0);\n"
-                  << "    if (" << imageVariable << " != 0)\n"
+                r << "    jassert (" << imageVariable << " != nullptr);\n"
+                  << "    if (" << imageVariable << " != nullptr)\n"
                   << "        " << imageVariable  << "->drawWithin (g, Rectangle<int> (x, y, width, height).toFloat(),\n"
                   << "    " << String::repeatedString (" ", imageVariable.length() + 18)
                   << (mode == stretched ? "RectanglePlacement::stretchToFit"