Sync'd branch releases/aurora with upstream @ Wed Oct  1 16:23:35 PDT 2014