upstream CiviCRM 4.2.15

Change-Id: I26e41125db9abcba075a619e7c68bb1050284350
Merge remote-tracking branch 'origin/contrib' into HEAD

Change-Id: Ib81e008b30a25a738cc86c1b6b643371c0123ccf
Merge "Merge remote-tracking branch 'origin/contrib' into HEAD"