Sync'd branch releases/aurora with upstream @ Wed Oct  8 09:28:41 PDT 2014