Make sure locks are removed on startup (closes #966)
Make sure locks are removed on startup (closes #966)

jondo/paperpile,jondo/paperpile,pombredanne/paperpile,pombredanne/paperpile,jondo/paperpile,jondo/paperpile,pombredanne/paperpile,jondo/paperpile,pombredanne/paperpile,pombredanne/paperpile