Sync'd branch releases/aurora with upstream @ Mon Sep  8 12:17:45 PDT 2014