Sync'd branch releases/aurora with upstream @ Wed Oct  8 19:22:38 PDT 2014