Merge branches 'fixes.2015.07.22a' and 'initexp.2015.08.04a' into HEAD