Fixes #3186. Closes #2214.
Fixes #3186. Closes #2214.


jvican/scala,slothspot/scala,lrytz/scala,felixmulder/scala,felixmulder/scala,slothspot/scala,lrytz/scala,shimib/scala,lrytz/scala,martijnhoekstra/scala,felixmulder/scala,jvican/scala,jvican/scala,scala/scala,scala/scala,martijnhoekstra/scala,shimib/scala,lrytz/scala,scala/scala,scala/scala,shimib/scala,jvican/scala,felixmulder/scala,felixmulder/scala,jvican/scala,scala/scala,slothspot/scala,martijnhoekstra/scala,shimib/scala,shimib/scala,lrytz/scala,slothspot/scala,felixmulder/scala,martijnhoekstra/scala,slothspot/scala,jvican/scala,felixmulder/scala,martijnhoekstra/scala,scala/scala,jvican/scala,lrytz/scala,slothspot/scala,shimib/scala,slothspot/scala,martijnhoekstra/scala