-Incremental tweak commit 2014/10/18.
Merge origin/master