Move from top level, add static IP support
Authored by: lmayes 2014-05-18
Parent: [r1249]
Child: [r1251]
