Official working file as of 2014-02-24. Will merge to master.