http://jspringers.myjetbrains.com/youtrack/issue/ID-133
Merge remote-tracking branch 'origin/snapshot' into snapshot