Merge branch 'toushay/log4javascript'