Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 14 19:23:43 PDT 2014