Included changes from gamejam-sept2013