Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 21 10:03:56 PDT 2014