Sync latest changes as of 2013-03-21

Based on ledger123/ledger123, branch: master