Sync'd branch releases/aurora with upstream @ Tue Oct  7 04:06:34 PDT 2014