Merge branches 'cbnum.2013.04.15a', 'fixes.2013.04.15a', 'srcu.2013.04.15a' and 'tiny.2013.04.15f' into HEAD