Merge "No longer restrict to -source 1.5 since it causes a warning with 1.7"