New Constants file
Merge remote-tracking branch 'alvaro/master'
Merge remote-tracking branch 'capi/master'