2014-01-07 simulator update
Merge branch 'daniels-latest' into temp/latest-from-christoffer