2014-01-09 Master Sync

Syncing Sigurd fork with master code by zomgponies 2014-01-09 18:17