Merge with JeroenBoersma as of 2013-09-16 (3 Fixes)