Sync'd branch releases/aurora with upstream @ Tue Oct 28 07:27:42 PDT 2014