am 7fd985f2: Merge commit \'7fa684064c0bfb6f7f27c4e03cda51aac5e930db\' into HEAD

* commit '7fd985f2a57f8899b960269b3e508dc55597ed9c':