master: commit 20141020