diff -Nru compiz-0.9.12.1+15.04.20150303/debian/changelog compiz-0.9.12.1+15.04.20150330/debian/changelog
--- compiz-0.9.12.1+15.04.20150303/debian/changelog	2015-03-30 16:03:15.000000000 +0000
+++ compiz-0.9.12.1+15.04.20150330/debian/changelog	2015-03-30 16:03:16.000000000 +0000
@@ -1,3 +1,27 @@
+compiz (1:0.9.12.1+15.04.20150330-0ubuntu1) vivid; urgency=medium
+
+  [ Chris Townsend ]
+  * Change default behavior of focus-follows-mouse where the desktop
+    will get focus when the mouse is over it. Also add option to allow
+    old behavior. (LP: #1427636)
+  * Clear out the lastMask vars when using the mouse to resize. (LP:
+    #1348254)
+
+  [ Eleni Maria Stea ]
+  * Minor optimisation fix: Replaced glLoadIdentity, glMultMatrixf with
+    glLoadMatrixf to avoid the unnecessary matrix multiplication:
+    identity * some projection matrix
+
+  [ Kevin Lange ]
+  * WinRules plugin: boost arbitrary window size limits to something
+    more reasonable (LP: #1431923)
+
+  [ Stephen M. Webb ]
+  * animations plugin: fixed a potential null pointer dereference (LP:
+    #1101573)
+
+ -- CI Train Bot <ci-train-bot@canonical.com>  Mon, 30 Mar 2015 15:58:21 +0000
+
 compiz (1:0.9.12.1+15.04.20150303-0ubuntu1) vivid; urgency=medium
 
   [ Andrea Azzarone ]
diff -Nru compiz-0.9.12.1+15.04.20150303/metadata/core.xml.in compiz-0.9.12.1+15.04.20150330/metadata/core.xml.in
--- compiz-0.9.12.1+15.04.20150303/metadata/core.xml.in	2015-03-03 18:30:42.000000000 +0000
+++ compiz-0.9.12.1+15.04.20150330/metadata/core.xml.in	2015-03-30 15:58:06.000000000 +0000
@@ -109,6 +109,11 @@
 			<min>0</min>
 			<max>10000</max>
 			</option>
+			<option name="focus_desktop" type="bool">
+			<_short>Focus Desktop</_short>
+			<_long>Focus the desktop when click to focus is disabled</_long>
+			<default>true</default>
+			</option>
 			<option name="focus_prevention_level" type="int">
 			<_short>Focus Prevention Level</_short>
 			<_long>Level of focus stealing prevention</_long>
diff -Nru compiz-0.9.12.1+15.04.20150303/plugins/animation/src/animation.cpp compiz-0.9.12.1+15.04.20150330/plugins/animation/src/animation.cpp
--- compiz-0.9.12.1+15.04.20150303/plugins/animation/src/animation.cpp	2015-03-03 18:30:50.000000000 +0000
+++ compiz-0.9.12.1+15.04.20150330/plugins/animation/src/animation.cpp	2015-03-30 15:57:59.000000000 +0000
@@ -1996,17 +1996,22 @@
 		getActualEffect (chosenEffect, AnimEventClose);
 
 	    // handle empty random effect list
-	    if (effectToBePlayed && effectToBePlayed == AnimEffectNone)
+	    if (effectToBePlayed)
 	    {
-		aw->mState = aw->mNewState;
-		return;
-	    }
+		if (effectToBePlayed == AnimEffectNone)
+		{
+		    aw->mState = aw->mNewState;
+		    return;
+		}
 
-	    aw->mCurAnimation =
-		effectToBePlayed->create (w, WindowEventClose, duration,
-					  effectToBePlayed, getIcon (w, true));
-	    aw->mCurAnimation->adjustPointerIconSize ();
-	    aw->enablePainting (true);
+		aw->mCurAnimation = effectToBePlayed->create (w,
+		                                              WindowEventClose,
+		                                              duration,
+		                                              effectToBePlayed,
+		                                              getIcon (w, true));
+		aw->mCurAnimation->adjustPointerIconSize ();
+		aw->enablePainting (true);
+	    }
 	}
 
 	activateEvent (true);
diff -Nru compiz-0.9.12.1+15.04.20150303/plugins/opengl/src/screen.cpp compiz-0.9.12.1+15.04.20150330/plugins/opengl/src/screen.cpp
--- compiz-0.9.12.1+15.04.20150303/plugins/opengl/src/screen.cpp	2015-03-03 18:30:42.000000000 +0000
+++ compiz-0.9.12.1+15.04.20150330/plugins/opengl/src/screen.cpp	2015-03-30 15:57:48.000000000 +0000
@@ -1735,8 +1735,7 @@
 
     #ifndef USE_GLES
     glMatrixMode (GL_PROJECTION);
-    glLoadIdentity ();
-    glMultMatrixf (projection_array);
+    glLoadMatrixf (projection_array);
     glMatrixMode (GL_MODELVIEW);
     #endif
 
diff -Nru compiz-0.9.12.1+15.04.20150303/plugins/resize/src/logic/src/resize-logic.cpp compiz-0.9.12.1+15.04.20150330/plugins/resize/src/logic/src/resize-logic.cpp
--- compiz-0.9.12.1+15.04.20150303/plugins/resize/src/logic/src/resize-logic.cpp	2015-03-03 18:30:42.000000000 +0000
+++ compiz-0.9.12.1+15.04.20150330/plugins/resize/src/logic/src/resize-logic.cpp	2015-03-30 15:58:14.000000000 +0000
@@ -205,6 +205,8 @@
 				    ((int) (event->xclient.data.l[3] ?
 				     event->xclient.data.l[3] : -1));
 
+				lastMaskX = lastMaskY = 0;
+
 				initiateResizeDefaultMode (
 				    &options->optionGetInitiateButton (),
 				    CompAction::StateInitButton, o);
diff -Nru compiz-0.9.12.1+15.04.20150303/plugins/winrules/winrules.xml.in compiz-0.9.12.1+15.04.20150330/plugins/winrules/winrules.xml.in
--- compiz-0.9.12.1+15.04.20150303/plugins/winrules/winrules.xml.in	2015-03-03 18:30:42.000000000 +0000
+++ compiz-0.9.12.1+15.04.20150330/plugins/winrules/winrules.xml.in	2015-03-30 15:57:54.000000000 +0000
@@ -103,7 +103,7 @@
 						<_long>Width values</_long>
 						<type>int</type>
 						<min>0</min>
-						<max>4096</max>
+						<max>65536</max>
 						<default>500</default>
 					</option>
 					<option name="size_height_values" type="list">
@@ -111,7 +111,7 @@
 						<_long>Height values</_long>
 						<type>int</type>
 						<min>0</min>
-						<max>4096</max>
+						<max>65536</max>
 						<default>500</default>
 					</option>
 				</subgroup>
diff -Nru compiz-0.9.12.1+15.04.20150303/src/event.cpp compiz-0.9.12.1+15.04.20150330/src/event.cpp
--- compiz-0.9.12.1+15.04.20150303/src/event.cpp	2015-03-03 18:30:42.000000000 +0000
+++ compiz-0.9.12.1+15.04.20150330/src/event.cpp	2015-03-30 15:58:06.000000000 +0000
@@ -2353,18 +2353,21 @@
 	    {
 		bool raise;
 		int  delay;
+		int  mask = CompWindowTypeDockMask;
 
 		raise = privateScreen.optionGetAutoraise ();
 		delay = privateScreen.optionGetAutoraiseDelay ();
 
+		if (!privateScreen.optionGetFocusDesktop ())
+		    mask = mask | CompWindowTypeDesktopMask;
+
 		if (autoRaiseTimer_.active () &&
 		    autoRaiseWindow_ != w->id ())
 		{
 		    autoRaiseTimer_.stop ();
 		}
 
-		if (w->type () & ~(CompWindowTypeDockMask |
-				   CompWindowTypeDesktopMask))
+		if (w->type () & ~mask)
 		{
 		    w->moveInputFocusTo ();