Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 21 14:34:47 PDT 2014