Merge tag '2014.08' into rpi

Release 2014.08-rpi