Coty Sutherland
committed
on 30 Apr 15
Reverse merging 2610 from the release tag.