Update Master with generic recent changes

Tested-on: zaphod <21 Oct 2014>