Merge branch 'master' into 0808xam

Conflicts:
src/server/WorkerRunnable.java