Merge pull request

2014-12-25