Sync'd branch releases/aurora with upstream @ Tue Oct 21 11:05:37 PDT 2014