Update from upstream 30/09/14 13:18:00

Attempting update from upstream.

Was STUPIDLY hard to find out how to do this!  Won't know if it's right until I try it either :(