Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 14 06:03:50 PDT 2014