Merge "Changes made by intelliJ 14.1" into lmp-dev