Fixed Bug 1095446

That's strange, much of the content in the etherpad has changed since! Anyways changes made!