20141216 update
Revert "20141216 update"

This reverts commit e8b93a15fe3d197a2c16e4c04e1f8b095dda348e.
Revert "Revert "20141216 update""

This reverts commit 1e3a17822fc8a7fbe7eb7ada58c9c0559a7607cf.
20141216