Merging trunk

[Gonzalo Aguilar Delgado]

Hi,

Is trunk already merged with angular branch? I'm waiting to work on new 
trunk for new set of patches.

Best regards,