20140413.2 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>