Sync'd branch releases/aurora with upstream @ Fri Sep 19 12:51:35 PDT 2014