Commit FRI 11-07-14 16:06