Upstream 12 05 2014

- Refactor PAL