Sync'd branch integration/b2g-inbound with upstream @ Mon Sep 15 07:17:37 PDT 2014