(Apple) Big merge - merge ios_ui_refactor by hand - note to meancoot -
don't let a branch get out of date for this long - merging it by
hand was not pretty
(OSX) Make apple_run_core backwards compatible with OSX 10.6
(OSX) apple_run_core - get rid of unneeded strlcpy call
Merge remote-tracking branch 'upstream/master'
Sync with upstream