diff --git a/build/linux/JUCE.make b/build/linux/JUCE.make
index 89cb299da2..0ea706efe5 100644
--- a/build/linux/JUCE.make
+++ b/build/linux/JUCE.make
@@ -54,12 +54,12 @@ OBJECTS := \
 	$(OBJDIR)/juce_PropertySet.o \
 	$(OBJDIR)/juce_InputStream.o \
 	$(OBJDIR)/juce_OutputStream.o \
-	$(OBJDIR)/juce_DirectoryIterator.o \
-	$(OBJDIR)/juce_File.o \
 	$(OBJDIR)/juce_FileInputStream.o \
 	$(OBJDIR)/juce_FileOutputStream.o \
 	$(OBJDIR)/juce_FileSearchPath.o \
 	$(OBJDIR)/juce_NamedPipe.o \
+	$(OBJDIR)/juce_DirectoryIterator.o \
+	$(OBJDIR)/juce_File.o \
 	$(OBJDIR)/juce_Socket.o \
 	$(OBJDIR)/juce_URL.o \
 	$(OBJDIR)/juce_BufferedInputStream.o \
@@ -67,18 +67,18 @@ OBJECTS := \
 	$(OBJDIR)/juce_GZIPCompressorOutputStream.o \
 	$(OBJDIR)/juce_GZIPDecompressorInputStream.o \
 	$(OBJDIR)/juce_MemoryInputStream.o \
-	$(OBJDIR)/juce_MemoryOutputStream.o \
 	$(OBJDIR)/juce_SubregionStream.o \
+	$(OBJDIR)/juce_MemoryOutputStream.o \
 	$(OBJDIR)/juce_PerformanceCounter.o \
 	$(OBJDIR)/juce_Uuid.o \
 	$(OBJDIR)/juce_ZipFile.o \
+	$(OBJDIR)/juce_StringArray.o \
+	$(OBJDIR)/juce_XmlDocument.o \
+	$(OBJDIR)/juce_XmlElement.o \
+	$(OBJDIR)/juce_StringPairArray.o \
 	$(OBJDIR)/juce_CharacterFunctions.o \
 	$(OBJDIR)/juce_LocalisedStrings.o \
 	$(OBJDIR)/juce_String.o \
-	$(OBJDIR)/juce_StringArray.o \
-	$(OBJDIR)/juce_StringPairArray.o \
-	$(OBJDIR)/juce_XmlDocument.o \
-	$(OBJDIR)/juce_XmlElement.o \
 	$(OBJDIR)/juce_InterProcessLock.o \
 	$(OBJDIR)/juce_ReadWriteLock.o \
 	$(OBJDIR)/juce_Thread.o \
@@ -100,18 +100,18 @@ OBJECTS := \
 	$(OBJDIR)/juce_MidiMessage.o \
 	$(OBJDIR)/juce_MidiMessageCollector.o \
 	$(OBJDIR)/juce_MidiMessageSequence.o \
+	$(OBJDIR)/juce_AudioProcessorPlayer.o \
+	$(OBJDIR)/juce_GenericAudioProcessorEditor.o \
 	$(OBJDIR)/juce_AudioProcessor.o \
 	$(OBJDIR)/juce_AudioProcessorEditor.o \
 	$(OBJDIR)/juce_AudioProcessorGraph.o \
-	$(OBJDIR)/juce_AudioProcessorPlayer.o \
-	$(OBJDIR)/juce_GenericAudioProcessorEditor.o \
-	$(OBJDIR)/juce_AudioPluginFormat.o \
 	$(OBJDIR)/juce_AudioPluginFormatManager.o \
 	$(OBJDIR)/juce_AudioPluginInstance.o \
 	$(OBJDIR)/juce_KnownPluginList.o \
 	$(OBJDIR)/juce_PluginDescription.o \
 	$(OBJDIR)/juce_PluginDirectoryScanner.o \
 	$(OBJDIR)/juce_PluginListComponent.o \
+	$(OBJDIR)/juce_AudioPluginFormat.o \
 	$(OBJDIR)/juce_VSTPluginFormat.o \
 	$(OBJDIR)/juce_AiffAudioFormat.o \
 	$(OBJDIR)/juce_AudioCDReader.o \
@@ -120,10 +120,10 @@ OBJECTS := \
 	$(OBJDIR)/juce_AudioSubsectionReader.o \
 	$(OBJDIR)/juce_AudioThumbnail.o \
 	$(OBJDIR)/juce_AudioThumbnailCache.o \
-	$(OBJDIR)/juce_FlacAudioFormat.o \
 	$(OBJDIR)/juce_OggVorbisAudioFormat.o \
 	$(OBJDIR)/juce_QuickTimeAudioFormat.o \
 	$(OBJDIR)/juce_WavAudioFormat.o \
+	$(OBJDIR)/juce_FlacAudioFormat.o \
 	$(OBJDIR)/juce_AudioFormatReaderSource.o \
 	$(OBJDIR)/juce_AudioSourcePlayer.o \
 	$(OBJDIR)/juce_AudioTransportSource.o \
@@ -139,9 +139,9 @@ OBJECTS := \
 	$(OBJDIR)/juce_MidiOutput.o \
 	$(OBJDIR)/juce_Sampler.o \
 	$(OBJDIR)/juce_Synthesiser.o \
-	$(OBJDIR)/juce_FileBasedDocument.o \
 	$(OBJDIR)/juce_RecentlyOpenedFilesList.o \
 	$(OBJDIR)/juce_UndoManager.o \
+	$(OBJDIR)/juce_FileBasedDocument.o \
 	$(OBJDIR)/juce_ActionBroadcaster.o \
 	$(OBJDIR)/juce_ActionListenerList.o \
 	$(OBJDIR)/juce_AsyncUpdater.o \
@@ -151,9 +151,9 @@ OBJECTS := \
 	$(OBJDIR)/juce_InterprocessConnectionServer.o \
 	$(OBJDIR)/juce_Message.o \
 	$(OBJDIR)/juce_MessageListener.o \
-	$(OBJDIR)/juce_MessageManager.o \
 	$(OBJDIR)/juce_MultiTimer.o \
 	$(OBJDIR)/juce_Timer.o \
+	$(OBJDIR)/juce_MessageManager.o \
 	$(OBJDIR)/juce_Brush.o \
 	$(OBJDIR)/juce_GradientBrush.o \
 	$(OBJDIR)/juce_ImageBrush.o \
@@ -161,18 +161,18 @@ OBJECTS := \
 	$(OBJDIR)/juce_Colour.o \
 	$(OBJDIR)/juce_ColourGradient.o \
 	$(OBJDIR)/juce_Colours.o \
-	$(OBJDIR)/juce_EdgeTable.o \
 	$(OBJDIR)/juce_Graphics.o \
 	$(OBJDIR)/juce_Justification.o \
 	$(OBJDIR)/juce_LowLevelGraphicsPostScriptRenderer.o \
 	$(OBJDIR)/juce_LowLevelGraphicsSoftwareRenderer.o \
 	$(OBJDIR)/juce_RectanglePlacement.o \
-	$(OBJDIR)/juce_Drawable.o \
-	$(OBJDIR)/juce_DrawableComposite.o \
-	$(OBJDIR)/juce_DrawableImage.o \
+	$(OBJDIR)/juce_EdgeTable.o \
 	$(OBJDIR)/juce_DrawablePath.o \
 	$(OBJDIR)/juce_DrawableText.o \
 	$(OBJDIR)/juce_SVGParser.o \
+	$(OBJDIR)/juce_Drawable.o \
+	$(OBJDIR)/juce_DrawableComposite.o \
+	$(OBJDIR)/juce_DrawableImage.o \
 	$(OBJDIR)/juce_DropShadowEffect.o \
 	$(OBJDIR)/juce_GlowEffect.o \
 	$(OBJDIR)/juce_ReduceOpacityEffect.o \
@@ -188,11 +188,11 @@ OBJECTS := \
 	$(OBJDIR)/juce_PathStrokeType.o \
 	$(OBJDIR)/juce_Point.o \
 	$(OBJDIR)/juce_PositionedRectangle.o \
-	$(OBJDIR)/juce_Rectangle.o \
 	$(OBJDIR)/juce_RectangleList.o \
+	$(OBJDIR)/juce_Rectangle.o \
+	$(OBJDIR)/juce_ImageConvolutionKernel.o \
 	$(OBJDIR)/juce_Image.o \
 	$(OBJDIR)/juce_ImageCache.o \
-	$(OBJDIR)/juce_ImageConvolutionKernel.o \
 	$(OBJDIR)/juce_ImageFileFormat.o \
 	$(OBJDIR)/juce_GIFLoader.o \
 	$(OBJDIR)/juce_JPEGLoader.o \
@@ -204,22 +204,22 @@ OBJECTS := \
 	$(OBJDIR)/juce_Button.o \
 	$(OBJDIR)/juce_DrawableButton.o \
 	$(OBJDIR)/juce_HyperlinkButton.o \
-	$(OBJDIR)/juce_ImageButton.o \
 	$(OBJDIR)/juce_ShapeButton.o \
 	$(OBJDIR)/juce_TextButton.o \
 	$(OBJDIR)/juce_ToggleButton.o \
 	$(OBJDIR)/juce_ToolbarButton.o \
+	$(OBJDIR)/juce_ImageButton.o \
 	$(OBJDIR)/juce_ComboBox.o \
 	$(OBJDIR)/juce_Label.o \
 	$(OBJDIR)/juce_ListBox.o \
 	$(OBJDIR)/juce_ProgressBar.o \
-	$(OBJDIR)/juce_Slider.o \
 	$(OBJDIR)/juce_TableHeaderComponent.o \
 	$(OBJDIR)/juce_TableListBox.o \
 	$(OBJDIR)/juce_TextEditor.o \
 	$(OBJDIR)/juce_Toolbar.o \
 	$(OBJDIR)/juce_ToolbarItemComponent.o \
 	$(OBJDIR)/juce_ToolbarItemPalette.o \
+	$(OBJDIR)/juce_Slider.o \
 	$(OBJDIR)/juce_TreeView.o \
 	$(OBJDIR)/juce_DirectoryContentsDisplayComponent.o \
 	$(OBJDIR)/juce_DirectoryContentsList.o \
@@ -233,12 +233,12 @@ OBJECTS := \
 	$(OBJDIR)/juce_FileTreeComponent.o \
 	$(OBJDIR)/juce_ImagePreviewComponent.o \
 	$(OBJDIR)/juce_WildcardFileFilter.o \
+	$(OBJDIR)/juce_KeyPressMappingSet.o \
+	$(OBJDIR)/juce_ModifierKeys.o \
 	$(OBJDIR)/juce_KeyboardFocusTraverser.o \
 	$(OBJDIR)/juce_KeyListener.o \
 	$(OBJDIR)/juce_KeyMappingEditorComponent.o \
 	$(OBJDIR)/juce_KeyPress.o \
-	$(OBJDIR)/juce_KeyPressMappingSet.o \
-	$(OBJDIR)/juce_ModifierKeys.o \
 	$(OBJDIR)/juce_ComponentAnimator.o \
 	$(OBJDIR)/juce_ComponentBoundsConstrainer.o \
 	$(OBJDIR)/juce_ComponentMovementWatcher.o \
@@ -251,10 +251,10 @@ OBJECTS := \
 	$(OBJDIR)/juce_StretchableLayoutResizerBar.o \
 	$(OBJDIR)/juce_StretchableObjectResizer.o \
 	$(OBJDIR)/juce_TabbedButtonBar.o \
-	$(OBJDIR)/juce_TabbedComponent.o \
 	$(OBJDIR)/juce_Viewport.o \
-	$(OBJDIR)/juce_LookAndFeel.o \
+	$(OBJDIR)/juce_TabbedComponent.o \
 	$(OBJDIR)/juce_OldSchoolLookAndFeel.o \
+	$(OBJDIR)/juce_LookAndFeel.o \
 	$(OBJDIR)/juce_MenuBarComponent.o \
 	$(OBJDIR)/juce_MenuBarModel.o \
 	$(OBJDIR)/juce_PopupMenu.o \
@@ -281,15 +281,19 @@ OBJECTS := \
 	$(OBJDIR)/juce_OpenGLComponent.o \
 	$(OBJDIR)/juce_PreferencesPanel.o \
 	$(OBJDIR)/juce_SystemTrayIconComponent.o \
-	$(OBJDIR)/juce_AlertWindow.o \
+	$(OBJDIR)/juce_TooltipWindow.o \
+	$(OBJDIR)/juce_TopLevelWindow.o \
 	$(OBJDIR)/juce_ComponentPeer.o \
+	$(OBJDIR)/juce_AlertWindow.o \
 	$(OBJDIR)/juce_DialogWindow.o \
 	$(OBJDIR)/juce_DocumentWindow.o \
 	$(OBJDIR)/juce_ResizableWindow.o \
 	$(OBJDIR)/juce_SplashScreen.o \
 	$(OBJDIR)/juce_ThreadWithProgressWindow.o \
-	$(OBJDIR)/juce_TooltipWindow.o \
-	$(OBJDIR)/juce_TopLevelWindow.o \
+	$(OBJDIR)/juce_linux_SystemStats.o \
+	$(OBJDIR)/juce_linux_Threads.o \
+	$(OBJDIR)/juce_linux_WebBrowserComponent.o \
+	$(OBJDIR)/juce_linux_Windowing.o \
 	$(OBJDIR)/juce_linux_Audio.o \
 	$(OBJDIR)/juce_linux_AudioCDReader.o \
 	$(OBJDIR)/juce_linux_FileChooser.o \
@@ -299,10 +303,6 @@ OBJECTS := \
 	$(OBJDIR)/juce_linux_Midi.o \
 	$(OBJDIR)/juce_linux_NamedPipe.o \
 	$(OBJDIR)/juce_linux_Network.o \
-	$(OBJDIR)/juce_linux_SystemStats.o \
-	$(OBJDIR)/juce_linux_Threads.o \
-	$(OBJDIR)/juce_linux_WebBrowserComponent.o \
-	$(OBJDIR)/juce_linux_Windowing.o \
 
 MKDIR_TYPE := msdos
 CMD := $(subst \,\\,$(ComSpec)$(COMSPEC))
@@ -419,16 +419,6 @@ $(OBJDIR)/juce_OutputStream.o: ../../src/juce_core/io/juce_OutputStream.cpp
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_DirectoryIterator.o: ../../src/juce_core/io/files/juce_DirectoryIterator.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
-$(OBJDIR)/juce_File.o: ../../src/juce_core/io/files/juce_File.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
 $(OBJDIR)/juce_FileInputStream.o: ../../src/juce_core/io/files/juce_FileInputStream.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -449,6 +439,16 @@ $(OBJDIR)/juce_NamedPipe.o: ../../src/juce_core/io/files/juce_NamedPipe.cpp
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
+$(OBJDIR)/juce_DirectoryIterator.o: ../../src/juce_core/io/files/juce_DirectoryIterator.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+$(OBJDIR)/juce_File.o: ../../src/juce_core/io/files/juce_File.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
 $(OBJDIR)/juce_Socket.o: ../../src/juce_core/io/network/juce_Socket.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -484,12 +484,12 @@ $(OBJDIR)/juce_MemoryInputStream.o: ../../src/juce_core/io/streams/juce_MemoryIn
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_MemoryOutputStream.o: ../../src/juce_core/io/streams/juce_MemoryOutputStream.cpp
+$(OBJDIR)/juce_SubregionStream.o: ../../src/juce_core/io/streams/juce_SubregionStream.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_SubregionStream.o: ../../src/juce_core/io/streams/juce_SubregionStream.cpp
+$(OBJDIR)/juce_MemoryOutputStream.o: ../../src/juce_core/io/streams/juce_MemoryOutputStream.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@@ -509,6 +509,26 @@ $(OBJDIR)/juce_ZipFile.o: ../../src/juce_core/misc/juce_ZipFile.cpp
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
+$(OBJDIR)/juce_StringArray.o: ../../src/juce_core/text/juce_StringArray.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+$(OBJDIR)/juce_XmlDocument.o: ../../src/juce_core/text/juce_XmlDocument.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+$(OBJDIR)/juce_XmlElement.o: ../../src/juce_core/text/juce_XmlElement.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+$(OBJDIR)/juce_StringPairArray.o: ../../src/juce_core/text/juce_StringPairArray.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
 $(OBJDIR)/juce_CharacterFunctions.o: ../../src/juce_core/text/juce_CharacterFunctions.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -524,26 +544,6 @@ $(OBJDIR)/juce_String.o: ../../src/juce_core/text/juce_String.cpp
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_StringArray.o: ../../src/juce_core/text/juce_StringArray.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
-$(OBJDIR)/juce_StringPairArray.o: ../../src/juce_core/text/juce_StringPairArray.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
-$(OBJDIR)/juce_XmlDocument.o: ../../src/juce_core/text/juce_XmlDocument.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
-$(OBJDIR)/juce_XmlElement.o: ../../src/juce_core/text/juce_XmlElement.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
 $(OBJDIR)/juce_InterProcessLock.o: ../../src/juce_core/threads/juce_InterProcessLock.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -649,6 +649,16 @@ $(OBJDIR)/juce_MidiMessageSequence.o: ../../src/juce_appframework/audio/midi/juc
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
+$(OBJDIR)/juce_AudioProcessorPlayer.o: ../../src/juce_appframework/audio/processors/juce_AudioProcessorPlayer.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+$(OBJDIR)/juce_GenericAudioProcessorEditor.o: ../../src/juce_appframework/audio/processors/juce_GenericAudioProcessorEditor.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
 $(OBJDIR)/juce_AudioProcessor.o: ../../src/juce_appframework/audio/processors/juce_AudioProcessor.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -664,21 +674,6 @@ $(OBJDIR)/juce_AudioProcessorGraph.o: ../../src/juce_appframework/audio/processo
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_AudioProcessorPlayer.o: ../../src/juce_appframework/audio/processors/juce_AudioProcessorPlayer.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
-$(OBJDIR)/juce_GenericAudioProcessorEditor.o: ../../src/juce_appframework/audio/processors/juce_GenericAudioProcessorEditor.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
-$(OBJDIR)/juce_AudioPluginFormat.o: ../../src/juce_appframework/audio/plugins/juce_AudioPluginFormat.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
 $(OBJDIR)/juce_AudioPluginFormatManager.o: ../../src/juce_appframework/audio/plugins/juce_AudioPluginFormatManager.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -709,6 +704,11 @@ $(OBJDIR)/juce_PluginListComponent.o: ../../src/juce_appframework/audio/plugins/
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
+$(OBJDIR)/juce_AudioPluginFormat.o: ../../src/juce_appframework/audio/plugins/juce_AudioPluginFormat.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
 $(OBJDIR)/juce_VSTPluginFormat.o: ../../src/juce_appframework/audio/plugins/formats/juce_VSTPluginFormat.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -749,11 +749,6 @@ $(OBJDIR)/juce_AudioThumbnailCache.o: ../../src/juce_appframework/audio/audio_fi
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_FlacAudioFormat.o: ../../src/juce_appframework/audio/audio_file_formats/juce_FlacAudioFormat.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
 $(OBJDIR)/juce_OggVorbisAudioFormat.o: ../../src/juce_appframework/audio/audio_file_formats/juce_OggVorbisAudioFormat.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -769,6 +764,11 @@ $(OBJDIR)/juce_WavAudioFormat.o: ../../src/juce_appframework/audio/audio_file_fo
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
+$(OBJDIR)/juce_FlacAudioFormat.o: ../../src/juce_appframework/audio/audio_file_formats/juce_FlacAudioFormat.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
 $(OBJDIR)/juce_AudioFormatReaderSource.o: ../../src/juce_appframework/audio/audio_sources/juce_AudioFormatReaderSource.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -844,11 +844,6 @@ $(OBJDIR)/juce_Synthesiser.o: ../../src/juce_appframework/audio/synthesisers/juc
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_FileBasedDocument.o: ../../src/juce_appframework/documents/juce_FileBasedDocument.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
 $(OBJDIR)/juce_RecentlyOpenedFilesList.o: ../../src/juce_appframework/documents/juce_RecentlyOpenedFilesList.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -859,6 +854,11 @@ $(OBJDIR)/juce_UndoManager.o: ../../src/juce_appframework/documents/juce_UndoMan
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
+$(OBJDIR)/juce_FileBasedDocument.o: ../../src/juce_appframework/documents/juce_FileBasedDocument.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
 $(OBJDIR)/juce_ActionBroadcaster.o: ../../src/juce_appframework/events/juce_ActionBroadcaster.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -904,11 +904,6 @@ $(OBJDIR)/juce_MessageListener.o: ../../src/juce_appframework/events/juce_Messag
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_MessageManager.o: ../../src/juce_appframework/events/juce_MessageManager.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
 $(OBJDIR)/juce_MultiTimer.o: ../../src/juce_appframework/events/juce_MultiTimer.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -919,6 +914,11 @@ $(OBJDIR)/juce_Timer.o: ../../src/juce_appframework/events/juce_Timer.cpp
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
+$(OBJDIR)/juce_MessageManager.o: ../../src/juce_appframework/events/juce_MessageManager.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
 $(OBJDIR)/juce_Brush.o: ../../src/juce_appframework/gui/graphics/brushes/juce_Brush.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -954,11 +954,6 @@ $(OBJDIR)/juce_Colours.o: ../../src/juce_appframework/gui/graphics/colour/juce_C
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_EdgeTable.o: ../../src/juce_appframework/gui/graphics/contexts/juce_EdgeTable.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
 $(OBJDIR)/juce_Graphics.o: ../../src/juce_appframework/gui/graphics/contexts/juce_Graphics.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -984,17 +979,7 @@ $(OBJDIR)/juce_RectanglePlacement.o: ../../src/juce_appframework/gui/graphics/co
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_Drawable.o: ../../src/juce_appframework/gui/graphics/drawables/juce_Drawable.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
-$(OBJDIR)/juce_DrawableComposite.o: ../../src/juce_appframework/gui/graphics/drawables/juce_DrawableComposite.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
-$(OBJDIR)/juce_DrawableImage.o: ../../src/juce_appframework/gui/graphics/drawables/juce_DrawableImage.cpp
+$(OBJDIR)/juce_EdgeTable.o: ../../src/juce_appframework/gui/graphics/contexts/juce_EdgeTable.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@@ -1014,6 +999,21 @@ $(OBJDIR)/juce_SVGParser.o: ../../src/juce_appframework/gui/graphics/drawables/j
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
+$(OBJDIR)/juce_Drawable.o: ../../src/juce_appframework/gui/graphics/drawables/juce_Drawable.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+$(OBJDIR)/juce_DrawableComposite.o: ../../src/juce_appframework/gui/graphics/drawables/juce_DrawableComposite.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+$(OBJDIR)/juce_DrawableImage.o: ../../src/juce_appframework/gui/graphics/drawables/juce_DrawableImage.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
 $(OBJDIR)/juce_DropShadowEffect.o: ../../src/juce_appframework/gui/graphics/effects/juce_DropShadowEffect.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -1089,12 +1089,17 @@ $(OBJDIR)/juce_PositionedRectangle.o: ../../src/juce_appframework/gui/graphics/g
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
+$(OBJDIR)/juce_RectangleList.o: ../../src/juce_appframework/gui/graphics/geometry/juce_RectangleList.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
 $(OBJDIR)/juce_Rectangle.o: ../../src/juce_appframework/gui/graphics/geometry/juce_Rectangle.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_RectangleList.o: ../../src/juce_appframework/gui/graphics/geometry/juce_RectangleList.cpp
+$(OBJDIR)/juce_ImageConvolutionKernel.o: ../../src/juce_appframework/gui/graphics/imaging/juce_ImageConvolutionKernel.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@@ -1109,11 +1114,6 @@ $(OBJDIR)/juce_ImageCache.o: ../../src/juce_appframework/gui/graphics/imaging/ju
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_ImageConvolutionKernel.o: ../../src/juce_appframework/gui/graphics/imaging/juce_ImageConvolutionKernel.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
 $(OBJDIR)/juce_ImageFileFormat.o: ../../src/juce_appframework/gui/graphics/imaging/juce_ImageFileFormat.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -1169,11 +1169,6 @@ $(OBJDIR)/juce_HyperlinkButton.o: ../../src/juce_appframework/gui/components/but
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_ImageButton.o: ../../src/juce_appframework/gui/components/buttons/juce_ImageButton.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
 $(OBJDIR)/juce_ShapeButton.o: ../../src/juce_appframework/gui/components/buttons/juce_ShapeButton.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -1194,6 +1189,11 @@ $(OBJDIR)/juce_ToolbarButton.o: ../../src/juce_appframework/gui/components/butto
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
+$(OBJDIR)/juce_ImageButton.o: ../../src/juce_appframework/gui/components/buttons/juce_ImageButton.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
 $(OBJDIR)/juce_ComboBox.o: ../../src/juce_appframework/gui/components/controls/juce_ComboBox.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -1214,11 +1214,6 @@ $(OBJDIR)/juce_ProgressBar.o: ../../src/juce_appframework/gui/components/control
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_Slider.o: ../../src/juce_appframework/gui/components/controls/juce_Slider.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
 $(OBJDIR)/juce_TableHeaderComponent.o: ../../src/juce_appframework/gui/components/controls/juce_TableHeaderComponent.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -1249,6 +1244,11 @@ $(OBJDIR)/juce_ToolbarItemPalette.o: ../../src/juce_appframework/gui/components/
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
+$(OBJDIR)/juce_Slider.o: ../../src/juce_appframework/gui/components/controls/juce_Slider.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
 $(OBJDIR)/juce_TreeView.o: ../../src/juce_appframework/gui/components/controls/juce_TreeView.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -1314,6 +1314,16 @@ $(OBJDIR)/juce_WildcardFileFilter.o: ../../src/juce_appframework/gui/components/
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
+$(OBJDIR)/juce_KeyPressMappingSet.o: ../../src/juce_appframework/gui/components/keyboard/juce_KeyPressMappingSet.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+$(OBJDIR)/juce_ModifierKeys.o: ../../src/juce_appframework/gui/components/keyboard/juce_ModifierKeys.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
 $(OBJDIR)/juce_KeyboardFocusTraverser.o: ../../src/juce_appframework/gui/components/keyboard/juce_KeyboardFocusTraverser.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -1334,16 +1344,6 @@ $(OBJDIR)/juce_KeyPress.o: ../../src/juce_appframework/gui/components/keyboard/j
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_KeyPressMappingSet.o: ../../src/juce_appframework/gui/components/keyboard/juce_KeyPressMappingSet.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
-$(OBJDIR)/juce_ModifierKeys.o: ../../src/juce_appframework/gui/components/keyboard/juce_ModifierKeys.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
 $(OBJDIR)/juce_ComponentAnimator.o: ../../src/juce_appframework/gui/components/layout/juce_ComponentAnimator.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -1404,17 +1404,12 @@ $(OBJDIR)/juce_TabbedButtonBar.o: ../../src/juce_appframework/gui/components/lay
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_TabbedComponent.o: ../../src/juce_appframework/gui/components/layout/juce_TabbedComponent.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
 $(OBJDIR)/juce_Viewport.o: ../../src/juce_appframework/gui/components/layout/juce_Viewport.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_LookAndFeel.o: ../../src/juce_appframework/gui/components/lookandfeel/juce_LookAndFeel.cpp
+$(OBJDIR)/juce_TabbedComponent.o: ../../src/juce_appframework/gui/components/layout/juce_TabbedComponent.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@@ -1424,6 +1419,11 @@ $(OBJDIR)/juce_OldSchoolLookAndFeel.o: ../../src/juce_appframework/gui/component
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
+$(OBJDIR)/juce_LookAndFeel.o: ../../src/juce_appframework/gui/components/lookandfeel/juce_LookAndFeel.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
 $(OBJDIR)/juce_MenuBarComponent.o: ../../src/juce_appframework/gui/components/menus/juce_MenuBarComponent.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -1554,7 +1554,12 @@ $(OBJDIR)/juce_SystemTrayIconComponent.o: ../../src/juce_appframework/gui/compon
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_AlertWindow.o: ../../src/juce_appframework/gui/components/windows/juce_AlertWindow.cpp
+$(OBJDIR)/juce_TooltipWindow.o: ../../src/juce_appframework/gui/components/windows/juce_TooltipWindow.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+$(OBJDIR)/juce_TopLevelWindow.o: ../../src/juce_appframework/gui/components/windows/juce_TopLevelWindow.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@@ -1564,6 +1569,11 @@ $(OBJDIR)/juce_ComponentPeer.o: ../../src/juce_appframework/gui/components/windo
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
+$(OBJDIR)/juce_AlertWindow.o: ../../src/juce_appframework/gui/components/windows/juce_AlertWindow.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
 $(OBJDIR)/juce_DialogWindow.o: ../../src/juce_appframework/gui/components/windows/juce_DialogWindow.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -1589,12 +1599,22 @@ $(OBJDIR)/juce_ThreadWithProgressWindow.o: ../../src/juce_appframework/gui/compo
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_TooltipWindow.o: ../../src/juce_appframework/gui/components/windows/juce_TooltipWindow.cpp
+$(OBJDIR)/juce_linux_SystemStats.o: platform_specific_code/juce_linux_SystemStats.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_TopLevelWindow.o: ../../src/juce_appframework/gui/components/windows/juce_TopLevelWindow.cpp
+$(OBJDIR)/juce_linux_Threads.o: platform_specific_code/juce_linux_Threads.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+$(OBJDIR)/juce_linux_WebBrowserComponent.o: platform_specific_code/juce_linux_WebBrowserComponent.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+$(OBJDIR)/juce_linux_Windowing.o: platform_specific_code/juce_linux_Windowing.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@@ -1644,25 +1664,5 @@ $(OBJDIR)/juce_linux_Network.o: platform_specific_code/juce_linux_Network.cpp
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_linux_SystemStats.o: platform_specific_code/juce_linux_SystemStats.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
-$(OBJDIR)/juce_linux_Threads.o: platform_specific_code/juce_linux_Threads.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
-$(OBJDIR)/juce_linux_WebBrowserComponent.o: platform_specific_code/juce_linux_WebBrowserComponent.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
-$(OBJDIR)/juce_linux_Windowing.o: platform_specific_code/juce_linux_Windowing.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
 -include $(OBJECTS:%.o=%.d)
 
diff --git a/build/macosx/platform_specific_code/juce_mac_NSViewComponentPeer.mm b/build/macosx/platform_specific_code/juce_mac_NSViewComponentPeer.mm
index 34bd4928db..55ac3f2da7 100644
--- a/build/macosx/platform_specific_code/juce_mac_NSViewComponentPeer.mm
+++ b/build/macosx/platform_specific_code/juce_mac_NSViewComponentPeer.mm
@@ -629,8 +629,7 @@ bool KeyPress::isKeyCurrentlyDown (const int keyCode) throw()
 
 static int getKeyCodeFromEvent (NSEvent* ev)
 {
-    String unicode (nsStringToJuce ([ev characters]));
-    String unmodified (nsStringToJuce ([ev charactersIgnoringModifiers]));
+    const String unmodified (nsStringToJuce ([ev charactersIgnoringModifiers]));
     int keyCode = unmodified[0];
 
     if (keyCode == 0x19) // (backwards-tab)
diff --git a/build/macosx/platform_specific_code/juce_posix_SharedCode.h b/build/macosx/platform_specific_code/juce_posix_SharedCode.h
index 3666d88eed..e3d5afea02 100644
--- a/build/macosx/platform_specific_code/juce_posix_SharedCode.h
+++ b/build/macosx/platform_specific_code/juce_posix_SharedCode.h
@@ -352,8 +352,41 @@ int64 File::getBytesFreeOnVolume() const throw()
 const String juce_getVolumeLabel (const String& filenameOnVolume,
                                   int& volumeSerialNumber) throw()
 {
-    // There is no equivalent on Linux
     volumeSerialNumber = 0;
+
+#if JUCE_MAC
+    struct VolAttrBuf
+    {
+        u_int32_t       length;
+        attrreference_t mountPointRef;
+        char            mountPointSpace [MAXPATHLEN];
+    } attrBuf;
+
+    struct attrlist attrList;
+    zerostruct (attrList);
+    attrList.bitmapcount = ATTR_BIT_MAP_COUNT;
+    attrList.volattr = ATTR_VOL_INFO | ATTR_VOL_NAME;
+
+    File f (filenameOnVolume);
+
+    for (;;)
+    {
+        if (getattrlist ((const char*) f.getFullPathName().toUTF8(),
+                         &attrList, &attrBuf, sizeof(attrBuf), 0) == 0)
+        {
+            return String::fromUTF8 (((const uint8*) &attrBuf.mountPointRef) + attrBuf.mountPointRef.attr_dataoffset,
+                                     (int) attrBuf.mountPointRef.attr_length);
+        }
+
+        const File parent (f.getParentDirectory());
+
+        if (f == parent)
+            break;
+
+        f = parent;
+    }
+#endif
+
     return String::empty;
 }
 
diff --git a/build/win32/platform_specific_code/juce_win32_ActiveXComponent.cpp b/build/win32/platform_specific_code/juce_win32_ActiveXComponent.cpp
index 387e65028a..f63c6357f1 100644
--- a/build/win32/platform_specific_code/juce_win32_ActiveXComponent.cpp
+++ b/build/win32/platform_specific_code/juce_win32_ActiveXComponent.cpp
@@ -306,9 +306,10 @@ public:
         if (wasShowing != isShowingNow)
         {
             wasShowing = isShowingNow;
-
             owner->setControlVisible (isShowingNow);
         }
+
+        componentMovedOrResized (true, true);
     }
 
     void componentVisibilityChanged (Component&)
diff --git a/build/win32/platform_specific_code/juce_win32_QuickTimeMovieComponent.cpp b/build/win32/platform_specific_code/juce_win32_QuickTimeMovieComponent.cpp
index 8e8a981653..bc0f5b28bc 100644
--- a/build/win32/platform_specific_code/juce_win32_QuickTimeMovieComponent.cpp
+++ b/build/win32/platform_specific_code/juce_win32_QuickTimeMovieComponent.cpp
@@ -38,7 +38,6 @@ using namespace QTOControlLib;
 
 bool juce_OpenQuickTimeMovieFromStream (InputStream* input, Movie& movie, Handle& dataHandle);
 
-static bool hasLoadedQT = false;
 static bool isQTAvailable = false;
 
 
@@ -95,10 +94,8 @@ QuickTimeMovieComponent::~QuickTimeMovieComponent()
 
 bool QuickTimeMovieComponent::isQuickTimeAvailable() throw()
 {
-    if (! hasLoadedQT)
+    if (! isQTAvailable)
     {
-        hasLoadedQT = true;
-
         isQTAvailable = (InitializeQTML (0) == noErr)
                            && (EnterMovies() == noErr);
     }
diff --git a/extras/audio plugins/wrapper/VST/juce_VST_Wrapper.cpp b/extras/audio plugins/wrapper/VST/juce_VST_Wrapper.cpp
index 1d8d61adad..2feb111cd2 100644
--- a/extras/audio plugins/wrapper/VST/juce_VST_Wrapper.cpp	
+++ b/extras/audio plugins/wrapper/VST/juce_VST_Wrapper.cpp	
@@ -597,7 +597,8 @@ public:
             filter->setNonRealtime (getCurrentProcessLevel() == 4 /* kVstProcessLevelOffline */);
 
 #if JUCE_WIN32
-            if (GetThreadPriority (GetCurrentThread()) <= THREAD_PRIORITY_NORMAL)
+            if (GetThreadPriority (GetCurrentThread()) <= THREAD_PRIORITY_NORMAL
+                  && GetThreadPriority (GetCurrentThread()) >= THREAD_PRIORITY_LOWEST)
                 filter->setNonRealtime (true);
 #endif
         }
diff --git a/extras/juce demo/build/linux/JuceDemo.make b/extras/juce demo/build/linux/JuceDemo.make
index 31b36490a1..997ccba348 100644
--- a/extras/juce demo/build/linux/JuceDemo.make	
+++ b/extras/juce demo/build/linux/JuceDemo.make	
@@ -39,11 +39,12 @@ ifeq ($(CONFIG),Release)
 endif
 
 OBJECTS := \
-	$(OBJDIR)/ApplicationStartup.o \
-	$(OBJDIR)/BinaryData.o \
-	$(OBJDIR)/juce_LibrarySource.o \
 	$(OBJDIR)/MainDemoWindow.o \
-	$(OBJDIR)/AudioDemo.o \
+	$(OBJDIR)/BinaryData.o \
+	$(OBJDIR)/ApplicationStartup.o \
+	$(OBJDIR)/juce_LibrarySource.o \
+	$(OBJDIR)/TreeViewDemo.o \
+	$(OBJDIR)/WidgetsDemo.o \
 	$(OBJDIR)/DragAndDropDemo.o \
 	$(OBJDIR)/FontsAndTextDemo.o \
 	$(OBJDIR)/InterprocessCommsDemo.o \
@@ -52,8 +53,7 @@ OBJECTS := \
 	$(OBJDIR)/QuickTimeDemo.o \
 	$(OBJDIR)/TableDemo.o \
 	$(OBJDIR)/ThreadingDemo.o \
-	$(OBJDIR)/TreeViewDemo.o \
-	$(OBJDIR)/WidgetsDemo.o \
+	$(OBJDIR)/AudioDemo.o \
 
 MKDIR_TYPE := msdos
 CMD := $(subst \,\\,$(ComSpec)$(COMSPEC))
@@ -95,7 +95,7 @@ else
 	-@if exist $(subst /,\,$(OBJDIR)) rmdir /s /q $(subst /,\,$(OBJDIR))
 endif
 
-$(OBJDIR)/ApplicationStartup.o: ../../src/ApplicationStartup.cpp
+$(OBJDIR)/MainDemoWindow.o: ../../src/MainDemoWindow.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@@ -105,17 +105,22 @@ $(OBJDIR)/BinaryData.o: ../../src/BinaryData.cpp
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
+$(OBJDIR)/ApplicationStartup.o: ../../src/ApplicationStartup.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
 $(OBJDIR)/juce_LibrarySource.o: ../../src/juce_LibrarySource.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/MainDemoWindow.o: ../../src/MainDemoWindow.cpp
+$(OBJDIR)/TreeViewDemo.o: ../../src/demos/TreeViewDemo.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/AudioDemo.o: ../../src/demos/AudioDemo.cpp
+$(OBJDIR)/WidgetsDemo.o: ../../src/demos/WidgetsDemo.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@@ -160,12 +165,7 @@ $(OBJDIR)/ThreadingDemo.o: ../../src/demos/ThreadingDemo.cpp
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/TreeViewDemo.o: ../../src/demos/TreeViewDemo.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
-$(OBJDIR)/WidgetsDemo.o: ../../src/demos/WidgetsDemo.cpp
+$(OBJDIR)/AudioDemo.o: ../../src/demos/AudioDemo.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
diff --git a/extras/the jucer/src/BinaryData.cpp b/extras/the jucer/src/BinaryData.cpp
index 1279f531a8..c08fddd03e 100644
--- a/extras/the jucer/src/BinaryData.cpp	
+++ b/extras/the jucer/src/BinaryData.cpp	
@@ -911,3 +911,4 @@ static const unsigned char temp4[] = {137,80,78,71,13,10,26,10,0,0,0,13,73,72,68
   0,98,28,9,155,95,0,2,104,68,236,11,1,8,160,17,225,73,128,0,3,0,120,52,172,151,198,78,252,63,0,0,0,0,73,69,78,68,174,66,
   96,130,0,0};
 const char* BinaryData::prefs_misc_png = (const char*) temp4;
+
diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp
index e509341c0c..f9e848ea7f 100644
--- a/juce_amalgamated.cpp
+++ b/juce_amalgamated.cpp
@@ -8200,13 +8200,23 @@ void MemoryOutputStream::reset() throw()
 
 bool MemoryOutputStream::write (const void* buffer, int howMany)
 {
-    int storageNeeded = position + howMany + 1;
-    storageNeeded = storageNeeded - (storageNeeded % blockSize) + blockSize;
+    if (howMany > 0)
+    {
+        int storageNeeded = position + howMany;
 
-    data->ensureSize (storageNeeded);
-    data->copyFrom (buffer, position, howMany);
-    position += howMany;
-    size = jmax (size, position);
+        if (storageNeeded >= data->getSize())
+        {
+            // if we need more space, increase the block by at least 10%..
+            storageNeeded += jmax (blockSize, storageNeeded / 10);
+            storageNeeded = storageNeeded - (storageNeeded % blockSize) + blockSize;
+
+            data->ensureSize (storageNeeded);
+        }
+
+        data->copyFrom (buffer, position, howMany);
+        position += howMany;
+        size = jmax (size, position);
+    }
 
     return true;
 }
@@ -52112,6 +52122,11 @@ void TreeView::resized()
     handleAsyncUpdate();
 }
 
+void TreeView::enablementChanged()
+{
+    repaint();
+}
+
 void TreeView::moveSelectedRow (int delta)
 {
     if (delta == 0)
@@ -246610,9 +246625,10 @@ public:
         if (wasShowing != isShowingNow)
         {
             wasShowing = isShowingNow;
-
             owner->setControlVisible (isShowingNow);
         }
+
+        componentMovedOrResized (true, true);
     }
 
     void componentVisibilityChanged (Component&)
@@ -246865,7 +246881,6 @@ using namespace QTOControlLib;
 
 bool juce_OpenQuickTimeMovieFromStream (InputStream* input, Movie& movie, Handle& dataHandle);
 
-static bool hasLoadedQT = false;
 static bool isQTAvailable = false;
 
 struct QTMovieCompInternal
@@ -246919,10 +246934,8 @@ QuickTimeMovieComponent::~QuickTimeMovieComponent()
 
 bool QuickTimeMovieComponent::isQuickTimeAvailable() throw()
 {
-    if (! hasLoadedQT)
+    if (! isQTAvailable)
     {
-        hasLoadedQT = true;
-
         isQTAvailable = (InitializeQTML (0) == noErr)
                            && (EnterMovies() == noErr);
     }
@@ -255227,8 +255240,41 @@ int64 File::getBytesFreeOnVolume() const throw()
 const String juce_getVolumeLabel (const String& filenameOnVolume,
                                   int& volumeSerialNumber) throw()
 {
-    // There is no equivalent on Linux
     volumeSerialNumber = 0;
+
+#if JUCE_MAC
+    struct VolAttrBuf
+    {
+        u_int32_t       length;
+        attrreference_t mountPointRef;
+        char            mountPointSpace [MAXPATHLEN];
+    } attrBuf;
+
+    struct attrlist attrList;
+    zerostruct (attrList);
+    attrList.bitmapcount = ATTR_BIT_MAP_COUNT;
+    attrList.volattr = ATTR_VOL_INFO | ATTR_VOL_NAME;
+
+    File f (filenameOnVolume);
+
+    for (;;)
+    {
+        if (getattrlist ((const char*) f.getFullPathName().toUTF8(),
+                         &attrList, &attrBuf, sizeof(attrBuf), 0) == 0)
+        {
+            return String::fromUTF8 (((const uint8*) &attrBuf.mountPointRef) + attrBuf.mountPointRef.attr_dataoffset,
+                                     (int) attrBuf.mountPointRef.attr_length);
+        }
+
+        const File parent (f.getParentDirectory());
+
+        if (f == parent)
+            break;
+
+        f = parent;
+    }
+#endif
+
     return String::empty;
 }
 
@@ -265230,8 +265276,41 @@ int64 File::getBytesFreeOnVolume() const throw()
 const String juce_getVolumeLabel (const String& filenameOnVolume,
                                   int& volumeSerialNumber) throw()
 {
-    // There is no equivalent on Linux
     volumeSerialNumber = 0;
+
+#if JUCE_MAC
+    struct VolAttrBuf
+    {
+        u_int32_t       length;
+        attrreference_t mountPointRef;
+        char            mountPointSpace [MAXPATHLEN];
+    } attrBuf;
+
+    struct attrlist attrList;
+    zerostruct (attrList);
+    attrList.bitmapcount = ATTR_BIT_MAP_COUNT;
+    attrList.volattr = ATTR_VOL_INFO | ATTR_VOL_NAME;
+
+    File f (filenameOnVolume);
+
+    for (;;)
+    {
+        if (getattrlist ((const char*) f.getFullPathName().toUTF8(),
+                         &attrList, &attrBuf, sizeof(attrBuf), 0) == 0)
+        {
+            return String::fromUTF8 (((const uint8*) &attrBuf.mountPointRef) + attrBuf.mountPointRef.attr_dataoffset,
+                                     (int) attrBuf.mountPointRef.attr_length);
+        }
+
+        const File parent (f.getParentDirectory());
+
+        if (f == parent)
+            break;
+
+        f = parent;
+    }
+#endif
+
     return String::empty;
 }
 
@@ -266743,8 +266822,7 @@ bool KeyPress::isKeyCurrentlyDown (const int keyCode) throw()
 
 static int getKeyCodeFromEvent (NSEvent* ev)
 {
-    String unicode (nsStringToJuce ([ev characters]));
-    String unmodified (nsStringToJuce ([ev charactersIgnoringModifiers]));
+    const String unmodified (nsStringToJuce ([ev charactersIgnoringModifiers]));
     int keyCode = unmodified[0];
 
     if (keyCode == 0x19) // (backwards-tab)
diff --git a/juce_amalgamated.h b/juce_amalgamated.h
index 2ee1f4b116..f2db242d27 100644
--- a/juce_amalgamated.h
+++ b/juce_amalgamated.h
@@ -43627,6 +43627,8 @@ public:
     bool keyPressed (const KeyPress& key);
     /** @internal */
     void colourChanged();
+    /** @internal */
+    void enablementChanged();
 
     juce_UseDebuggingNewOperator
 
diff --git a/src/juce_app_includes.h b/src/juce_app_includes.h
index dcd56c6bb1..6af21635e1 100644
--- a/src/juce_app_includes.h
+++ b/src/juce_app_includes.h
@@ -521,9 +521,6 @@
 #ifndef __JUCE_TOOLBARITEMCOMPONENT_JUCEHEADER__
  #include "juce_appframework/gui/components/controls/juce_ToolbarItemComponent.h"
 #endif
-#ifndef __JUCE_TREEVIEW_JUCEHEADER__
- #include "juce_appframework/gui/components/controls/juce_TreeView.h"
-#endif
 #ifndef __JUCE_TEXTEDITOR_JUCEHEADER__
  #include "juce_appframework/gui/components/controls/juce_TextEditor.h"
 #endif
@@ -551,6 +548,9 @@
 #ifndef __JUCE_LABEL_JUCEHEADER__
  #include "juce_appframework/gui/components/controls/juce_Label.h"
 #endif
+#ifndef __JUCE_TREEVIEW_JUCEHEADER__
+ #include "juce_appframework/gui/components/controls/juce_TreeView.h"
+#endif
 #ifndef __JUCE_SLIDERPROPERTYCOMPONENT_JUCEHEADER__
  #include "juce_appframework/gui/components/properties/juce_SliderPropertyComponent.h"
 #endif
diff --git a/src/juce_appframework/gui/components/controls/juce_TreeView.cpp b/src/juce_appframework/gui/components/controls/juce_TreeView.cpp
index 53b5bac502..17eea6eea0 100644
--- a/src/juce_appframework/gui/components/controls/juce_TreeView.cpp
+++ b/src/juce_appframework/gui/components/controls/juce_TreeView.cpp
@@ -572,6 +572,11 @@ void TreeView::resized()
     handleAsyncUpdate();
 }
 
+void TreeView::enablementChanged()
+{
+    repaint();
+}
+
 void TreeView::moveSelectedRow (int delta)
 {
     if (delta == 0)
diff --git a/src/juce_appframework/gui/components/controls/juce_TreeView.h b/src/juce_appframework/gui/components/controls/juce_TreeView.h
index d007f607bf..0d0424d08e 100644
--- a/src/juce_appframework/gui/components/controls/juce_TreeView.h
+++ b/src/juce_appframework/gui/components/controls/juce_TreeView.h
@@ -619,6 +619,8 @@ public:
     bool keyPressed (const KeyPress& key);
     /** @internal */
     void colourChanged();
+    /** @internal */
+    void enablementChanged();
 
     juce_UseDebuggingNewOperator
 
diff --git a/src/juce_core/io/streams/juce_MemoryOutputStream.cpp b/src/juce_core/io/streams/juce_MemoryOutputStream.cpp
index a039e89244..273aa14149 100644
--- a/src/juce_core/io/streams/juce_MemoryOutputStream.cpp
+++ b/src/juce_core/io/streams/juce_MemoryOutputStream.cpp
@@ -75,13 +75,23 @@ void MemoryOutputStream::reset() throw()
 
 bool MemoryOutputStream::write (const void* buffer, int howMany)
 {
-    int storageNeeded = position + howMany + 1;
-    storageNeeded = storageNeeded - (storageNeeded % blockSize) + blockSize;
+    if (howMany > 0)
+    {
+        int storageNeeded = position + howMany;
 
-    data->ensureSize (storageNeeded);
-    data->copyFrom (buffer, position, howMany);
-    position += howMany;
-    size = jmax (size, position);
+        if (storageNeeded >= data->getSize())
+        {
+            // if we need more space, increase the block by at least 10%..
+            storageNeeded += jmax (blockSize, storageNeeded / 10);
+            storageNeeded = storageNeeded - (storageNeeded % blockSize) + blockSize;
+
+            data->ensureSize (storageNeeded);
+        }
+
+        data->copyFrom (buffer, position, howMany);
+        position += howMany;
+        size = jmax (size, position);
+    }
 
     return true;
 }