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