Modified trough upgrade to IntellijJ 13.
Merge remote-tracking branch 'origin/master'