Merge "Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name" into klp-modular-dev