Merged SECO U-Boot 2013.10 v4.1326
Merge master and jpe_changes