20131226
hp1000 commit 2
Merge branch 'master' into hp1000