Merge branch 'master' into master
diff --git a/subpar.bzl b/subpar.bzl
index 2183f0a..b433115 100644
--- a/subpar.bzl
+++ b/subpar.bzl
@@ -16,6 +16,8 @@
 
 load("//:debug.bzl", "dump")
 
+DEFAULT_COMPILER = '//compiler:compiler.par'
+
 def _parfile_impl(ctx):
     """Implementation of parfile() rule"""
     # Find the main entry point
@@ -117,7 +119,7 @@
     "imports": attr.string_list(default = []),
     "default_python_version": attr.string(mandatory = True),
     "compiler": attr.label(
-        default = Label("//compiler:compiler.par"),
+        default = Label(DEFAULT_COMPILER),
         executable = True,
         cfg = "host",
     ),
@@ -187,6 +189,7 @@
     See [py_binary](http://www.bazel.io/docs/be/python.html#py_binary)
     for arguments and usage.
     """
+    compiler = kwargs.pop('compiler', DEFAULT_COMPILER)
     zip_safe = kwargs.pop('zip_safe', True)
     native.py_binary(name=name, **kwargs)
 
@@ -197,7 +200,9 @@
     testonly = kwargs.get('testonly', False)
     parfile(name=name + '.par', src=name, main=main, imports=imports,
             default_python_version=default_python_version, visibility=visibility,
-            testonly=testonly, zip_safe=zip_safe)
+            compiler=compiler,
+            testonly=testonly,
+            zip_safe=zip_safe)
 
 def par_test(name, **kwargs):
     """An executable Python test.