Merge recent commits

dogecoin/dogecoin.com#59
dogecoin/dogecoin.com#60