Revert "Revert "20141021v4""

This reverts commit 42314d8ee5b8320d26fe7dc63cab212149921071.