Merged all changes from trunk since December 13, 2013.