Merge branch 'less.js/1.5.0-wip'

Conflicts:
	.jshintrc
	Makefile
	package.json

test/less/sourcemaps/basic.less

@@ -0,0 +1,26 @@
+@var: black;
+
+.a() {
+  color: red;
+}
+
+.b {
+  color: green;
+  .a();
+  color: blue;
+  background: @var;
+}
+
+.a, .b {
+  background: green;
+  .c, .d {
+    background: gray;
+    & + & {
+      color: red;
+    }
+  }
+}
+
+.extend:extend(.a all) {
+  color: pink;
+}