merged release/20141216a