SBT/JVM options: Add '@'-trick and #-style comment
Merge commit 'refs/pull/43/head'