8.0-20141104-010210
Merge commit 'fd0e203' into 8.0