Sync'd branch releases/aurora with upstream @ Sun Oct  5 00:09:41 PDT 2014