20131220 commit
Manual merge.