Update for 2014.02

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Merge remote-tracking branch 'upstream/master'