Merge branch '3.0'

CONTRIBUTORS.txt

@@ -118,4 +118,5 @@ Paul McMillan, 2012/07/26
 Mitar, 2012/07/28
 Adam DePue, 2012/08/22
 Thomas Meson, 2012/08/28
-Daniel Lundin, 2012/08/30 
+Daniel Lundin, 2012/08/30
+Alexey Zatelepin, 2012/09/18