Merge Branch 1.5.x with Master for commit Apr 10, 2013