Daily Commit 140825 from MBP

140825